[Refactor] #40498 Separated player-redraw-types.h from player-status.h

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 4bbeb36..50a1a13 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -641,6 +641,7 @@
     <ClInclude Include="..\..\src\cmd-io\macro-util.h" />\r
     <ClInclude Include="..\..\src\cmd-visual\cmd-map.h" />\r
     <ClInclude Include="..\..\src\core\asking-player.h" />\r
+    <ClInclude Include="..\..\src\core\player-redraw-types.h" />\r
     <ClInclude Include="..\..\src\core\status-reseter.h" />\r
     <ClInclude Include="..\..\src\core\visuals-reseter.h" />\r
     <ClInclude Include="..\..\src\core\window-redrawer.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 568fabf..55f0305 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3637,6 +3637,9 @@
     <ClInclude Include="..\..\src\core\player-update-types.h">
       <Filter>core</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\core\player-redraw-types.h">
+      <Filter>core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 4554af0..87c4f63 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -113,6 +113,7 @@ hengband_SOURCES = \
        core/magic-effects-timeout-reducer.c core/magic-effects-timeout-reducer.h \
        core/output-updater.c core/output-updater.h \
        core/player-processor.c core/player-processor.h \
+       core/player-redraw-types.h \
        core/player-update-types.h \
        core/scores.c core/scores.h \
        core/show-file.c core/show-file.h \

diff --git a/src/birth/birth-stat.c b/src/birth/birth-stat.c
index a78b8a1..7d7ad27 100644 (file)
--- a/src/birth/birth-stat.c
+++ b/src/birth/birth-stat.c
@@ -1,4 +1,5 @@
 #include "birth/birth-stat.h"
+#include "core/player-redraw-types.h"
 #include "sv-definition/sv-weapon-types.h"
 #include "player/player-class.h"
 #include "player/player-personality.h"

diff --git a/src/cmd-action/cmd-hissatsu.c b/src/cmd-action/cmd-hissatsu.c
index 2c13257..480d73b 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.c
+++ b/src/cmd-action/cmd-hissatsu.c
@@ -12,6 +12,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor-object.h"

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index b066871..ee98014 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -13,6 +13,7 @@
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 4fef580..6008e51 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -3,6 +3,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index 64df832..b054df4 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -10,6 +10,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor-object.h"

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 86cf9f9..38c112f 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -16,6 +16,7 @@
 #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/player-update-types.h"
 #include "core/scores.h"
 #include "core/show-file.h"

diff --git a/src/cmd-io/cmd-gameoption.c b/src/cmd-io/cmd-gameoption.c
index 1fb6ac5..07fd120 100644 (file)
--- a/src/cmd-io/cmd-gameoption.c
+++ b/src/cmd-io/cmd-gameoption.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick.h"
 #include "cmd-io/cmd-autopick.h"
 #include "cmd-io/cmd-dump.h"
+#include "core/player-redraw-types.h"
 #include "core/show-file.h"
 #include "game-option/game-play-options.h"
 #include "game-option/keymap-directory-getter.h"

diff --git a/src/cmd-io/cmd-process-screen.c b/src/cmd-io/cmd-process-screen.c
index 0cb8b90..9ae2c87 100644 (file)
--- a/src/cmd-io/cmd-process-screen.c
+++ b/src/cmd-io/cmd-process-screen.c
@@ -7,6 +7,7 @@
 #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-item.c b/src/cmd-item/cmd-item.c
index 9c568b7..a84e9b4 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -23,6 +23,7 @@
 #include "cmd-item/cmd-zapwand.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/quest.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index 15f7b60..b7341c5 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -8,6 +8,7 @@
 #include "art-definition/art-accessory-types.h"
 #include "art-definition/art-armor-types.h"
 #include "cmd/cmd-basic.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/show-file.h"
 #include "floor/floor-object.h"

diff --git a/src/cmd-visual/cmd-draw.c b/src/cmd-visual/cmd-draw.c
index 136c077..f5c52a3 100644 (file)
--- a/src/cmd-visual/cmd-draw.c
+++ b/src/cmd-visual/cmd-draw.c
@@ -1,5 +1,6 @@
 #include "cmd-visual/cmd-draw.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "io/files-util.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 8c074d8..4779fb3 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -19,6 +19,7 @@
 #include "combat/slaying.h"
 #include "core/asking-player.h"
 #include "core/output-updater.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 4354c01..af7e97e 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -1,5 +1,6 @@
 #include "combat/shoot.h"
 #include "art-definition/art-bow-types.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/combat/slaying.c b/src/combat/slaying.c
index 76e61e5..58d196e 100644 (file)
--- a/src/combat/slaying.c
+++ b/src/combat/slaying.c
@@ -1,5 +1,6 @@
 #include "combat/slaying.h"
 #include "art-definition/art-sword-types.h"
+#include "core/player-redraw-types.h"
 #include "mind/mind-samurai.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index c4c4197..2b3f4ca 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -1,6 +1,7 @@
 #include "core/hp-mp-processor.h"
 #include "cmd-action/cmd-pet.h"
 #include "core/hp-mp-regenerator.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor.h"
 #include "floor/pattern-walk.h"
 #include "grid/feature.h"

diff --git a/src/core/hp-mp-regenerator.c b/src/core/hp-mp-regenerator.c
index 665d5b5..5d2f8ad 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -1,5 +1,6 @@
 #include "core/hp-mp-regenerator.h"
 #include "cmd-item/cmd-magiceat.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "floor/floor.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index bbe773d..5f3d837 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -1,4 +1,5 @@
 #include "core/player-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "core/speed-table.h"

diff --git a/src/core/player-redraw-types.h b/src/core/player-redraw-types.h
new file mode 100644 (file)
index 0000000..6e8cba0
--- /dev/null
+++ b/src/core/player-redraw-types.h
@@ -0,0 +1,32 @@
+#pragma once
+
+typedef enum player_redraw_type {
+       PR_MISC = 0x00000001L, /*!< 再描画フラグ: 種族と職業 / Display Race/Class */
+       PR_TITLE = 0x00000002L, /*!< 再描画フラグ: 称号 / Display Title */
+       PR_LEV = 0x00000004L, /*!< 再描画フラグ: レベル / Display Level */
+       PR_EXP = 0x00000008L, /*!< 再描画フラグ: 経験値 / Display Experience */
+       PR_STATS = 0x00000010L, /*!< 再描画フラグ: ステータス /  Display Stats */
+       PR_ARMOR = 0x00000020L, /*!< 再描画フラグ: AC / Display Armor */
+       PR_HP = 0x00000040L, /*!< 再描画フラグ: HP / Display Hitpoints */
+       PR_MANA = 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_STATUS = 0x00008000L, /*!< 再描画フラグ: プレイヤーの付与状態 /  Display Status Bar */
+       PR_XXX0 = 0x00010000L, /*!< (unused) */
+       PR_UHEALTH = 0x00020000L, /*!< 再描画フラグ: ペットのステータス / Display Uma Health Bar */
+       PR_XXX1 = 0x00040000L, /*!< (unused) */
+       PR_XXX2 = 0x00080000L, /*!< (unused) */
+       PR_STATE = 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 */
+} player_redraw_type;

diff --git a/src/core/stuff-handler.c b/src/core/stuff-handler.c
index e505145..50105d5 100644 (file)
--- a/src/core/stuff-handler.c
+++ b/src/core/stuff-handler.c
@@ -1,4 +1,5 @@
 #include "core/stuff-handler.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/window-redrawer.h"
 

diff --git a/src/core/window-redrawer.c b/src/core/window-redrawer.c
index 48b15d8..e2d9739 100644 (file)
--- a/src/core/window-redrawer.c
+++ b/src/core/window-redrawer.c
@@ -4,6 +4,7 @@
  * @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.c b/src/dungeon/dungeon-processor.c
index 24faccc..a96fd51 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -3,6 +3,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "core/hp-mp-regenerator.h"
 #include "core/player-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/turn-compensator.h"

diff --git a/src/effect/effect-monster-oldies.c b/src/effect/effect-monster-oldies.c
index b6d9655..3ea5475 100644 (file)
--- a/src/effect/effect-monster-oldies.c
+++ b/src/effect/effect-monster-oldies.c
@@ -1,4 +1,5 @@
 #include "effect/effect-monster-oldies.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/effect/effect-monster-psi.c b/src/effect/effect-monster-psi.c
index 7dc231d..0280082 100644 (file)
--- a/src/effect/effect-monster-psi.c
+++ b/src/effect/effect-monster-psi.c
@@ -1,4 +1,5 @@
 #include "effect/effect-monster-psi.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor.h"
 #include "mind/mind-mirror-master.h"
 #include "monster-race/monster-race.h"

diff --git a/src/effect/effect-monster-spirit.c b/src/effect/effect-monster-spirit.c
index 83a1cb2..04a32af 100644 (file)
--- a/src/effect/effect-monster-spirit.c
+++ b/src/effect/effect-monster-spirit.c
@@ -1,5 +1,6 @@
 #include "effect/effect-monster-spirit.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags2.h"

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 79a6013..9e6ff28 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -5,6 +5,7 @@
  */
 
 #include "effect/effect-monster.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-monster-switcher.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index 7439053..caa2495 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -1,6 +1,7 @@
 #include "effect/effect-player-resist-hurt.h"
 #include "art-definition/art-sword-types.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "inventory/inventory-damage.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index 837be82..0341f70 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -1,4 +1,5 @@
 #include "effect/effect-player-spirit.h"
+#include "core/player-redraw-types.h"
 #include "mind/mind-mirror-master.h"
 #include "mspell/mspells3.h"
 #include "status/bad-status-setter.h"

diff --git a/src/floor/floor-events.c b/src/floor/floor-events.c
index eca4a42..a8f371a 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -1,5 +1,6 @@
 #include "floor/floor-events.h"
 #include "cmd-io/cmd-dump.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index 31b8aed..f1c1f40 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -1,4 +1,5 @@
 #include "floor/floor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/inventory/inventory-curse.c b/src/inventory/inventory-curse.c
index de48366..81adefb 100644 (file)
--- a/src/inventory/inventory-curse.c
+++ b/src/inventory/inventory-curse.c
@@ -1,6 +1,7 @@
 #include "inventory/inventory-curse.h"
 #include "art-definition/art-accessory-types.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/files-util.h"

diff --git a/src/inventory/player-inventory.c b/src/inventory/player-inventory.c
index 7bf1295..832e7ef 100644 (file)
--- a/src/inventory/player-inventory.c
+++ b/src/inventory/player-inventory.c
@@ -1,5 +1,6 @@
 #include "inventory/player-inventory.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor-object.h"
 #include "floor/object-scanner.h"
 #include "game-option/birth-options.h"

diff --git a/src/io/cursor.c b/src/io/cursor.c
index b7ef404..7de5fe0 100644 (file)
--- a/src/io/cursor.c
+++ b/src/io/cursor.c
@@ -1,4 +1,5 @@
 #include "io/cursor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/io/input-key-processor.c b/src/io/input-key-processor.c
index 52b82d4..ede9c73 100644 (file)
--- a/src/io/input-key-processor.c
+++ b/src/io/input-key-processor.c
@@ -37,6 +37,7 @@
 #include "cmd-visual/cmd-visuals.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "dungeon/dungeon.h"

diff --git a/src/io/report.c b/src/io/report.c
index 1dcb8c1..ce5e124 100644 (file)
--- a/src/io/report.c
+++ b/src/io/report.c
@@ -7,6 +7,7 @@
 
 #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.c b/src/io/screen-util.c
index c05581c..a649b1b 100644 (file)
--- a/src/io/screen-util.c
+++ b/src/io/screen-util.c
@@ -11,6 +11,7 @@
 
 #include "io/screen-util.h"
 #include "core/player-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index 434c3e7..db0ec1f 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -13,6 +13,7 @@
 #include "cmd-action/cmd-pet.h"
 #include "cmd-building/cmd-building.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/market/bounty.c b/src/market/bounty.c
index d9fdec1..d591816 100644 (file)
--- a/src/market/bounty.c
+++ b/src/market/bounty.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick.h"
 #include "cmd-building/cmd-building.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"

diff --git a/src/melee/melee-postprocess.c b/src/melee/melee-postprocess.c
index 9adea97..e45aea5 100644 (file)
--- a/src/melee/melee-postprocess.c
+++ b/src/melee/melee-postprocess.c
@@ -11,23 +11,24 @@
  */
 
 #include "melee/melee-postprocess.h"
-#include "monster-attack/monster-attack-types.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor.h"
 #include "grid/grid.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
+#include "monster-attack/monster-attack-types.h"
+#include "monster-floor/monster-death.h"
+#include "monster-floor/monster-move.h"
+#include "monster-floor/monster-remover.h"
+#include "monster-race/monster-race-hook.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags-resistance.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/race-flags3.h"
 #include "monster-race/race-flags7.h"
-#include "monster-race/monster-race-hook.h"
 #include "monster/monster-describer.h"
 #include "monster/monster-description-types.h"
-#include "monster-floor/monster-death.h"
 #include "monster/monster-info.h"
-#include "monster-floor/monster-move.h"
-#include "monster-floor/monster-remover.h"
 #include "monster/monster-status.h"
 #include "pet/pet-fall-off.h"
 #include "player/player-class.h"

diff --git a/src/melee/monster-attack-monster.c b/src/melee/monster-attack-monster.c
index fe5368a..ce04d9d 100644 (file)
--- a/src/melee/monster-attack-monster.c
+++ b/src/melee/monster-attack-monster.c
@@ -7,6 +7,7 @@
 #include "melee/monster-attack-monster.h"
 #include "combat/attack-accuracy.h"
 #include "combat/hallucination-attacks-table.h"
+#include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "effect/effect-characteristics.h"
 #include "main/sound-definitions-table.h"

diff --git a/src/mind/mind-force-trainer.c b/src/mind/mind-force-trainer.c
index 3dc1595..deaed63 100644 (file)
--- a/src/mind/mind-force-trainer.c
+++ b/src/mind/mind-force-trainer.c
@@ -1,5 +1,6 @@
 #include "mind/mind-force-trainer.h"
 #include "cmd-action/cmd-pet.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/mind/mind-magic-resistance.c b/src/mind/mind-magic-resistance.c
index 2670ed4..4904ec7 100644 (file)
--- a/src/mind/mind-magic-resistance.c
+++ b/src/mind/mind-magic-resistance.c
@@ -1,4 +1,5 @@
 #include "mind/mind-magic-resistance.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/mind/mind-mirror-master.c b/src/mind/mind-mirror-master.c
index 5620d63..c1cb8cf 100644 (file)
--- a/src/mind/mind-mirror-master.c
+++ b/src/mind/mind-mirror-master.c
@@ -1,5 +1,6 @@
 #include "mind/mind-mirror-master.h"
 #include "cmd-action/cmd-pet.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/mind/mind-ninja.c b/src/mind/mind-ninja.c
index 83e6b21..e378f1c 100644 (file)
--- a/src/mind/mind-ninja.c
+++ b/src/mind/mind-ninja.c
@@ -1,6 +1,7 @@
 #include "mind/mind-ninja.h"
 #include "cmd-action/cmd-attack.h"
 #include "combat/combat-options-type.h"
+#include "core/player-redraw-types.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"

diff --git a/src/mind/mind-samurai.c b/src/mind/mind-samurai.c
index 1c53172..0adc3bc 100644 (file)
--- a/src/mind/mind-samurai.c
+++ b/src/mind/mind-samurai.c
@@ -8,6 +8,7 @@
 #include "cmd-action/cmd-attack.h"
 #include "cmd-action/cmd-pet.h"
 #include "cmd/cmd-basic.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "io/input-key-acceptor.h"

diff --git a/src/mind/mind-sniper.c b/src/mind/mind-sniper.c
index 6ae3876..71e01aa 100644 (file)
--- a/src/mind/mind-sniper.c
+++ b/src/mind/mind-sniper.c
@@ -8,6 +8,7 @@
 #include "mind/mind-sniper.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"

diff --git a/src/mind/mind-warrior-mage.c b/src/mind/mind-warrior-mage.c
index ea11915..0fe2ded 100644 (file)
--- a/src/mind/mind-warrior-mage.c
+++ b/src/mind/mind-warrior-mage.c
@@ -1,5 +1,6 @@
 #include "mind/mind-warrior-mage.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "player/player-damage.h"
 #include "view/display-messages.h"
 

diff --git a/src/mind/mind.c b/src/mind/mind.c
index 1ed63fe..537014b 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -20,6 +20,7 @@
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/mind/racial-kutar.c b/src/mind/racial-kutar.c
index b19715b..1ca6bc9 100644 (file)
--- a/src/mind/racial-kutar.c
+++ b/src/mind/racial-kutar.c
@@ -1,4 +1,5 @@
 #include "mind/racial-kutar.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 87a2655..34bfc2c 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -16,6 +16,7 @@
 #include "cmd-item/cmd-zapwand.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/monster-attack/monster-eating.c b/src/monster-attack/monster-eating.c
index 9c5ec1a..6381239 100644 (file)
--- a/src/monster-attack/monster-eating.c
+++ b/src/monster-attack/monster-eating.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster-attack/monster-eating.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"

diff --git a/src/monster-floor/monster-death.c b/src/monster-floor/monster-death.c
index f7572c5..ff910c3 100644 (file)
--- a/src/monster-floor/monster-death.c
+++ b/src/monster-floor/monster-death.c
@@ -4,6 +4,7 @@
 #include "art-definition/art-protector-types.h"
 #include "art-definition/art-weapon-types.h"
 #include "art-definition/random-art-effects.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index 172e3a1..fa021bf 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick-pref-processor.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd-visual/cmd-draw.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"

diff --git a/src/monster/monster-update.c b/src/monster/monster-update.c
index 923b393..0720a83 100644 (file)
--- a/src/monster/monster-update.c
+++ b/src/monster/monster-update.c
@@ -5,6 +5,7 @@
  */
 
 #include "monster/monster-update.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "game-option/birth-options.h"

diff --git a/src/mspell/mspell-dispel.c b/src/mspell/mspell-dispel.c
index b744c1c..6d1b85f 100644 (file)
--- a/src/mspell/mspell-dispel.c
+++ b/src/mspell/mspell-dispel.c
@@ -1,4 +1,5 @@
 #include "mspell/mspell-dispel.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "mind/mind-force-trainer.h"

diff --git a/src/mspell/mspell-status.c b/src/mspell/mspell-status.c
index aa0f701..f9aa1b2 100644 (file)
--- a/src/mspell/mspell-status.c
+++ b/src/mspell/mspell-status.c
@@ -6,6 +6,7 @@
  */
 
 #include "mspell/mspell-status.h"
+#include "core/player-redraw-types.h"
 #include "mind/drs-types.h"
 #include "monster-race/monster-race.h"
 #include "monster-race/race-flags1.h"

diff --git a/src/mspell/mspells1.c b/src/mspell/mspells1.c
index c0c71ff..f6d8246 100644 (file)
--- a/src/mspell/mspells1.c
+++ b/src/mspell/mspells1.c
@@ -10,6 +10,7 @@
  */
 
 #include "mspell/mspells1.h"
+#include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/mspell/mspells2.c b/src/mspell/mspells2.c
index 3099ec4..0b6691c 100644 (file)
--- a/src/mspell/mspells2.c
+++ b/src/mspell/mspells2.c
@@ -10,6 +10,7 @@
  */
 
 #include "mspell/mspells2.h"
+#include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/mspell/mspells3.c b/src/mspell/mspells3.c
index cf069a1..18748c4 100644 (file)
--- a/src/mspell/mspells3.c
+++ b/src/mspell/mspells3.c
@@ -14,6 +14,7 @@
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/mutation/mutation-processor.c b/src/mutation/mutation-processor.c
index b3ae9d9..ebe4c3f 100644 (file)
--- a/src/mutation/mutation-processor.c
+++ b/src/mutation/mutation-processor.c
@@ -1,5 +1,6 @@
 #include "mutation/mutation-processor.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "grid/grid.h"
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/pet/pet-fall-off.c b/src/pet/pet-fall-off.c
index 6e68ecb..18bd402 100644 (file)
--- a/src/pet/pet-fall-off.c
+++ b/src/pet/pet-fall-off.c
@@ -5,6 +5,7 @@
  */
 
 #include "pet/pet-fall-off.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"

diff --git a/src/player-attack/attack-chaos-effect.c b/src/player-attack/attack-chaos-effect.c
index 9202296..6f4729c 100644 (file)
--- a/src/player-attack/attack-chaos-effect.c
+++ b/src/player-attack/attack-chaos-effect.c
@@ -7,6 +7,7 @@
 
 #include "player-attack/attack-chaos-effect.h"
 #include "art-definition/art-weapon-types.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/player/digestion-processor.c b/src/player/digestion-processor.c
index 7f3c14c..0111cc0 100644 (file)
--- a/src/player/digestion-processor.c
+++ b/src/player/digestion-processor.c
@@ -1,4 +1,5 @@
 #include "player/digestion-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"

diff --git a/src/player/player-class.c b/src/player/player-class.c
index 4094e83..a248c99 100644 (file)
--- a/src/player/player-class.c
+++ b/src/player/player-class.c
@@ -5,6 +5,7 @@
  */
 
 #include "player/player-class.h"
+#include "core/player-redraw-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "player/player-race.h"
 #include "system/object-type-definition.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index d5cbdf9..3697839 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -3,6 +3,7 @@
 #include "cmd-building/cmd-building.h"
 #include "cmd-io/cmd-process-screen.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/quest.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 5f5f85d..25530b3 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -145,6 +145,7 @@
 #include "cmd-action/cmd-attack.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "core/stuff-handler.h"

diff --git a/src/player/player-race.c b/src/player/player-race.c
index 939d748..0eb6da0 100644 (file)
--- a/src/player/player-race.c
+++ b/src/player/player-race.c
@@ -1,4 +1,5 @@
 #include "player/player-race.h"
+#include "core/player-redraw-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "player/player-race-types.h"
 #include "system/object-type-definition.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index d4a3393..9db5893 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -12,6 +12,7 @@
 #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/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/player/player-status.h b/src/player/player-status.h
index b5b0a77..eb75e7d 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -362,35 +362,6 @@ typedef struct player_type
 
        BIT_FLAGS update;       /* Pending Updates */
        BIT_FLAGS redraw;       /* Normal Redraws */
-#define PR_MISC         0x00000001L     /*!< 再描画フラグ: 種族と職業 / Display Race/Class */
-#define PR_TITLE        0x00000002L     /*!< 再描画フラグ: 称号 / Display Title */
-#define PR_LEV          0x00000004L     /*!< 再描画フラグ: レベル / Display Level */
-#define PR_EXP          0x00000008L     /*!< 再描画フラグ: 経験値 / Display Experience */
-#define PR_STATS        0x00000010L     /*!< 再描画フラグ: ステータス /  Display Stats */
-#define PR_ARMOR        0x00000020L     /*!< 再描画フラグ: AC / Display Armor */
-#define PR_HP           0x00000040L     /*!< 再描画フラグ: HP / Display Hitpoints */
-#define PR_MANA         0x00000080L     /*!< 再描画フラグ: MP / Display Mana */
-#define PR_GOLD         0x00000100L     /*!< 再描画フラグ: 所持金 / Display Gold */
-#define PR_DEPTH        0x00000200L     /*!< 再描画フラグ: ダンジョンの階 / Display Depth */
-#define PR_EQUIPPY      0x00000400L     /*!< 再描画フラグ: 装備シンボル / Display equippy chars */
-#define PR_HEALTH       0x00000800L     /*!< 再描画フラグ: モンスターのステータス / Display Health Bar */
-#define PR_CUT          0x00001000L     /*!< 再描画フラグ: 負傷度 / Display Extra (Cut) */
-#define PR_STUN         0x00002000L     /*!< 再描画フラグ: 朦朧度 / Display Extra (Stun) */
-#define PR_HUNGER       0x00004000L     /*!< 再描画フラグ: 空腹度 / Display Extra (Hunger) */
-#define PR_STATUS       0x00008000L     /*!< 再描画フラグ: プレイヤーの付与状態 /  Display Status Bar */
-#define PR_XXX0         0x00010000L     /*!< (unused) */
-#define PR_UHEALTH      0x00020000L     /*!< 再描画フラグ: ペットのステータス / Display Uma Health Bar */
-#define PR_XXX1         0x00040000L     /*!< (unused) */
-#define PR_XXX2         0x00080000L     /*!< (unused) */
-#define PR_STATE        0x00100000L     /*!< 再描画フラグ: プレイヤーの行動状態 / Display Extra (State) */
-#define PR_SPEED        0x00200000L     /*!< 再描画フラグ: 加速 / Display Extra (Speed) */
-#define PR_STUDY        0x00400000L     /*!< 再描画フラグ: 学習 / Display Extra (Study) */
-#define PR_IMITATION    0x00800000L     /*!< 再描画フラグ: ものまね / Display Extra (Imitation) */
-#define PR_EXTRA        0x01000000L     /*!< 再描画フラグ: 拡張ステータス全体 / Display Extra Info */
-#define PR_BASIC        0x02000000L     /*!< 再描画フラグ: 基本ステータス全体 / Display Basic Info */
-#define PR_MAP          0x04000000L     /*!< 再描画フラグ: ゲームマップ / Display Map */
-#define PR_WIPE         0x08000000L     /*!< 再描画フラグ: 画面消去 / Hack -- Total Redraw */
-
        BIT_FLAGS window;       /* Window Redraws */
 #define PW_INVEN        0x00000001L     /*!<サブウィンドウ描画フラグ: 所持品-装備品 / Display inven/equip */
 #define PW_EQUIP        0x00000002L     /*!<サブウィンドウ描画フラグ: 装備品-所持品 / Display equip/inven */

diff --git a/src/realm/realm-chaos.c b/src/realm/realm-chaos.c
index ddb892f..0663eaa 100644 (file)
--- a/src/realm/realm-chaos.c
+++ b/src/realm/realm-chaos.c
@@ -1,6 +1,7 @@
 #include "realm/realm-chaos.h"
 #include "cmd-action/cmd-spell.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "effect/effect-characteristics.h"
 #include "io/targeting.h"
 #include "player/attack-defense-types.h"

diff --git a/src/realm/realm-hex.c b/src/realm/realm-hex.c
index 6e0387d..d4f3c9b 100644 (file)
--- a/src/realm/realm-hex.c
+++ b/src/realm/realm-hex.c
@@ -18,6 +18,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-quaff.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-object.h"

diff --git a/src/realm/realm-hissatsu.c b/src/realm/realm-hissatsu.c
index 1aa483b..7a5e77b 100644 (file)
--- a/src/realm/realm-hissatsu.c
+++ b/src/realm/realm-hissatsu.c
@@ -5,6 +5,7 @@
 #include "cmd/cmd-basic.h"
 #include "combat/combat-options-type.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/dungeon.h"

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index 6b96bbb..f8e33fa 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -1,5 +1,6 @@
 #include "cmd-action/cmd-spell.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "effect/effect-characteristics.h"
 #include "io/targeting.h"

diff --git a/src/specific-object/death-scythe.c b/src/specific-object/death-scythe.c
index 87c65b4..e1b8356 100644 (file)
--- a/src/specific-object/death-scythe.c
+++ b/src/specific-object/death-scythe.c
@@ -7,6 +7,7 @@
 
 #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/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 918f44a..8dc3f15 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -1,4 +1,5 @@
 #include "spell-kind/earthquake.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/spell-kind/spells-fetcher.c b/src/spell-kind/spells-fetcher.c
index cb0e849..79bfb94 100644 (file)
--- a/src/spell-kind/spells-fetcher.c
+++ b/src/spell-kind/spells-fetcher.c
@@ -1,4 +1,5 @@
 #include "spell-kind/spells-fetcher.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-floor.c b/src/spell-kind/spells-floor.c
index c889aca..76393b9 100644 (file)
--- a/src/spell-kind/spells-floor.c
+++ b/src/spell-kind/spells-floor.c
@@ -7,6 +7,7 @@
 #include "spell-kind/spells-floor.h"
 #include "cmd-io/cmd-dump.h"
 #include "cmd/cmd-basic.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 7d9ee1e..7337250 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -1,5 +1,6 @@
 #include "spell-kind/spells-genocide.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-neighbor.c b/src/spell-kind/spells-neighbor.c
index 439f7e3..9774312 100644 (file)
--- a/src/spell-kind/spells-neighbor.c
+++ b/src/spell-kind/spells-neighbor.c
@@ -1,4 +1,5 @@
 #include "spell-kind/spells-neighbor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-recall.c b/src/spell-kind/spells-recall.c
index 10fd379..80fb9b1 100644 (file)
--- a/src/spell-kind/spells-recall.c
+++ b/src/spell-kind/spells-recall.c
@@ -1,5 +1,6 @@
 #include "spell-kind/spells-recall.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-world.c b/src/spell-kind/spells-world.c
index c43b455..9b331ff 100644 (file)
--- a/src/spell-kind/spells-world.c
+++ b/src/spell-kind/spells-world.c
@@ -1,6 +1,7 @@
 #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/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-town.h"

diff --git a/src/spell-realm/spells-chaos.c b/src/spell-realm/spells-chaos.c
index 87e2ac1..4c52a69 100644 (file)
--- a/src/spell-realm/spells-chaos.c
+++ b/src/spell-realm/spells-chaos.c
@@ -1,4 +1,5 @@
 #include "spell-realm/spells-chaos.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"

diff --git a/src/spell-realm/spells-craft.c b/src/spell-realm/spells-craft.c
index 118bd76..89c70ce 100644 (file)
--- a/src/spell-realm/spells-craft.c
+++ b/src/spell-realm/spells-craft.c
@@ -1,4 +1,5 @@
 #include "spell-realm/spells-craft.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/spell-realm/spells-crusade.c b/src/spell-realm/spells-crusade.c
index 0b116f8..f79cd27 100644 (file)
--- a/src/spell-realm/spells-crusade.c
+++ b/src/spell-realm/spells-crusade.c
@@ -5,6 +5,7 @@
  */
 
 #include "spell-realm/spells-crusade.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/spell-realm/spells-demon.c b/src/spell-realm/spells-demon.c
index 8483dbb..5b8fa4f 100644 (file)
--- a/src/spell-realm/spells-demon.c
+++ b/src/spell-realm/spells-demon.c
@@ -1,4 +1,5 @@
 #include "spell-realm/spells-demon.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/spell-realm/spells-hex.c b/src/spell-realm/spells-hex.c
index af6958c..ca55acf 100644 (file)
--- a/src/spell-realm/spells-hex.c
+++ b/src/spell-realm/spells-hex.c
@@ -1,5 +1,6 @@
 #include "spell-realm/spells-hex.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "floor/floor.h"
 #include "monster-race/monster-race.h"

diff --git a/src/spell-realm/spells-song.c b/src/spell-realm/spells-song.c
index c0b2b74..6fa66be 100644 (file)
--- a/src/spell-realm/spells-song.c
+++ b/src/spell-realm/spells-song.c
@@ -1,4 +1,5 @@
 #include "spell-realm/spells-song.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "floor/floor.h"

diff --git a/src/spell-realm/spells-sorcery.c b/src/spell-realm/spells-sorcery.c
index 7fdc741..64594dd 100644 (file)
--- a/src/spell-realm/spells-sorcery.c
+++ b/src/spell-realm/spells-sorcery.c
@@ -1,5 +1,6 @@
 #include "spell-realm/spells-sorcery.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "floor/floor-object.h"
 #include "game-option/input-options.h"
 #include "inventory/inventory-object.h"

diff --git a/src/spell/spells-object.c b/src/spell/spells-object.c
index 669da21..ae91e41 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -9,6 +9,7 @@
 #include "autopick/autopick.h"
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index aa50c9f..1410c5f 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -8,6 +8,7 @@
 #include "cmd-action/cmd-spell.h"
 #include "cmd-item/cmd-magiceat.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/status/action-setter.c b/src/status/action-setter.c
index 9dcdb15..56ab615 100644 (file)
--- a/src/status/action-setter.c
+++ b/src/status/action-setter.c
@@ -12,6 +12,7 @@
  */
 
 #include "status/action-setter.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "player/attack-defense-types.h"
 #include "player/special-defense-types.h"

diff --git a/src/status/bad-status-setter.c b/src/status/bad-status-setter.c
index 3f0c0c4..1d4a722 100644 (file)
--- a/src/status/bad-status-setter.c
+++ b/src/status/bad-status-setter.c
@@ -1,4 +1,5 @@
 #include "status/bad-status-setter.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/status/base-status.c b/src/status/base-status.c
index 313bc91..2fbef19 100644 (file)
--- a/src/status/base-status.c
+++ b/src/status/base-status.c
@@ -1,4 +1,5 @@
 #include "status/base-status.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "game-option/birth-options.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/status/body-improvement.c b/src/status/body-improvement.c
index 509200f..1562ddc 100644 (file)
--- a/src/status/body-improvement.c
+++ b/src/status/body-improvement.c
@@ -1,4 +1,5 @@
 #include "status/body-improvement.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"

diff --git a/src/status/buff-setter.c b/src/status/buff-setter.c
index c78eabc..64525e9 100644 (file)
--- a/src/status/buff-setter.c
+++ b/src/status/buff-setter.c
@@ -1,4 +1,5 @@
 #include "status/buff-setter.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/status/element-resistance.c b/src/status/element-resistance.c
index c2f546f..e619477 100644 (file)
--- a/src/status/element-resistance.c
+++ b/src/status/element-resistance.c
@@ -1,4 +1,5 @@
 #include "status/element-resistance.h"
+#include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"
 #include "player/player-move.h"

diff --git a/src/status/form-changer.c b/src/status/form-changer.c
index ab45795..a95127a 100644 (file)
--- a/src/status/form-changer.c
+++ b/src/status/form-changer.c
@@ -1,4 +1,5 @@
 #include "status/form-changer.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/status/shape-changer.c b/src/status/shape-changer.c
index 87e4919..8408656 100644 (file)
--- a/src/status/shape-changer.c
+++ b/src/status/shape-changer.c
@@ -3,6 +3,7 @@
 #include "birth/birth-body-spec.h"
 #include "birth/birth-stat.h"
 #include "core/hp-mp-processor.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "grid/grid.h"

diff --git a/src/status/sight-setter.c b/src/status/sight-setter.c
index 96c3937..579bebf 100644 (file)
--- a/src/status/sight-setter.c
+++ b/src/status/sight-setter.c
@@ -1,4 +1,5 @@
 #include "status/sight-setter.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/status/temporary-resistance.c b/src/status/temporary-resistance.c
index 1352003..da4d4b3 100644 (file)
--- a/src/status/temporary-resistance.c
+++ b/src/status/temporary-resistance.c
@@ -1,4 +1,5 @@
 #include "status/temporary-resistance.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/store/store.c b/src/store/store.c
index a6eac25..9a98557 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -30,6 +30,7 @@
 #include "cmd-visual/cmd-draw.h"
 #include "cmd-visual/cmd-visuals.h"
 #include "core/asking-player.h"
+#include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "mind/mind-sniper.h"
 #include "core/stuff-handler.h"

diff --git a/src/world/world-movement-processor.c b/src/world/world-movement-processor.c
index 6710308..b6a7e13 100644 (file)
--- a/src/world/world-movement-processor.c
+++ b/src/world/world-movement-processor.c
@@ -1,5 +1,6 @@
 #include "world/world-movement-processor.h"
 #include "cmd-io/cmd-save.h"
+#include "core/player-redraw-types.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "game-option/birth-options.h"