[Refactor] #40498 Moved window redrawoing flags from player-status.h to window-redrawer.h

diff --git a/src/autopick/autopick-util.c b/src/autopick/autopick-util.c
index 4beddc2..59e3955 100644 (file)
--- a/src/autopick/autopick-util.c
+++ b/src/autopick/autopick-util.c
@@ -1,6 +1,7 @@
 #include "autopick/autopick-util.h"
 #include "autopick/autopick-menu-data-table.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "game-option/input-options.h"
 #include "main/sound-of-music.h"
 #include "monster-race/race-indice-types.h"

diff --git a/src/birth/character-builder.c b/src/birth/character-builder.c
index 709484a..6da56aa 100644 (file)
--- a/src/birth/character-builder.c
+++ b/src/birth/character-builder.c
@@ -16,6 +16,7 @@
 #include "birth/birth-wizard.h"
 #include "birth/game-play-initializer.h"
 #include "birth/quick-start.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-town.h"
 #include "floor/wild.h"
 #include "game-option/option-flags.h"

diff --git a/src/cmd-action/cmd-hissatsu.c b/src/cmd-action/cmd-hissatsu.c
index 480d73b..36f9251 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.c
+++ b/src/cmd-action/cmd-hissatsu.c
@@ -15,6 +15,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/text-display-options.h"

diff --git a/src/cmd-action/cmd-mane.c b/src/cmd-action/cmd-mane.c
index ee98014..f36f090 100644 (file)
--- a/src/cmd-action/cmd-mane.c
+++ b/src/cmd-action/cmd-mane.c
@@ -15,6 +15,7 @@
 #include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/cmd-action/cmd-pet.c b/src/cmd-action/cmd-pet.c
index 6008e51..1de3595 100644 (file)
--- a/src/cmd-action/cmd-pet.c
+++ b/src/cmd-action/cmd-pet.c
@@ -6,6 +6,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor.h"
 #include "game-option/input-options.h"

diff --git a/src/cmd-action/cmd-spell.c b/src/cmd-action/cmd-spell.c
index b054df4..758d017 100644 (file)
--- a/src/cmd-action/cmd-spell.c
+++ b/src/cmd-action/cmd-spell.c
@@ -13,6 +13,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/cmd-building/cmd-building.c b/src/cmd-building/cmd-building.c
index 38c112f..2a08097 100644 (file)
--- a/src/cmd-building/cmd-building.c
+++ b/src/cmd-building/cmd-building.c
@@ -22,6 +22,7 @@
 #include "core/show-file.h"
 #include "core/special-internal-keys.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-events.h"
 #include "floor/floor-save.h"
 #include "floor/floor.h"

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

diff --git a/src/cmd-item/cmd-activate.c b/src/cmd-item/cmd-activate.c
index 68da191..147f022 100644 (file)
--- a/src/cmd-item/cmd-activate.c
+++ b/src/cmd-item/cmd-activate.c
@@ -14,6 +14,7 @@
 #include "core/asking-player.h"
 #include "core/hp-mp-processor.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "floor/floor-object.h"

diff --git a/src/cmd-item/cmd-eat.c b/src/cmd-item/cmd-eat.c
index 6e4bcdd..7a7fc00 100644 (file)
--- a/src/cmd-item/cmd-eat.c
+++ b/src/cmd-item/cmd-eat.c
@@ -7,6 +7,7 @@
 #include "cmd-item/cmd-eat.h"
 #include "core/hp-mp-processor.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"

diff --git a/src/cmd-item/cmd-item.c b/src/cmd-item/cmd-item.c
index a84e9b4..0707503 100644 (file)
--- a/src/cmd-item/cmd-item.c
+++ b/src/cmd-item/cmd-item.c
@@ -26,6 +26,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/quest.h"
 #include "floor/floor-object.h"
 #include "game-option/birth-options.h"

diff --git a/src/cmd-item/cmd-read.c b/src/cmd-item/cmd-read.c
index b7341c5..a289fd3 100644 (file)
--- a/src/cmd-item/cmd-read.c
+++ b/src/cmd-item/cmd-read.c
@@ -11,6 +11,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/show-file.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"

diff --git a/src/cmd-item/cmd-smith.c b/src/cmd-item/cmd-smith.c
index 4f2e287..fc95ae5 100644 (file)
--- a/src/cmd-item/cmd-smith.c
+++ b/src/cmd-item/cmd-smith.c
@@ -9,6 +9,7 @@
 #include "cmd/cmd-basic.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "game-option/text-display-options.h"
 #include "io/command-repeater.h"

diff --git a/src/cmd-item/cmd-usestaff.c b/src/cmd-item/cmd-usestaff.c
index 86d9388..fdd6a5c 100644 (file)
--- a/src/cmd-item/cmd-usestaff.c
+++ b/src/cmd-item/cmd-usestaff.c
@@ -1,6 +1,7 @@
 #include "cmd-item/cmd-usestaff.h"
 #include "cmd/cmd-basic.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/cmd-item/cmd-zaprod.c b/src/cmd-item/cmd-zaprod.c
index 2652212..fc4f983 100644 (file)
--- a/src/cmd-item/cmd-zaprod.c
+++ b/src/cmd-item/cmd-zaprod.c
@@ -1,6 +1,7 @@
 #include "cmd-item/cmd-zaprod.h"
 #include "cmd/cmd-basic.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/cmd-item/cmd-zapwand.c b/src/cmd-item/cmd-zapwand.c
index 397b75f..e80b28b 100644 (file)
--- a/src/cmd-item/cmd-zapwand.c
+++ b/src/cmd-item/cmd-zapwand.c
@@ -1,6 +1,7 @@
 #include "cmd-item/cmd-zapwand.h"
 #include "cmd/cmd-basic.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/cmd-visual/cmd-draw.c b/src/cmd-visual/cmd-draw.c
index f5c52a3..249a862 100644 (file)
--- a/src/cmd-visual/cmd-draw.c
+++ b/src/cmd-visual/cmd-draw.c
@@ -3,6 +3,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "io/files-util.h"
 #include "io/input-key-acceptor.h"
 #include "main/sound-of-music.h"

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index 4779fb3..588bf23 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -22,6 +22,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/core/asking-player.c b/src/core/asking-player.c
index 222210c..ab3cfaa 100644 (file)
--- a/src/core/asking-player.c
+++ b/src/core/asking-player.c
@@ -1,6 +1,7 @@
 #include "core/asking-player.h"
 #include "cmd-io/macro-util.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "game-option/input-options.h"
 #include "io/command-repeater.h"
 #include "io/input-key-acceptor.h"

diff --git a/src/core/hp-mp-processor.c b/src/core/hp-mp-processor.c
index 2b3f4ca..1de776f 100644 (file)
--- a/src/core/hp-mp-processor.c
+++ b/src/core/hp-mp-processor.c
@@ -2,6 +2,7 @@
 #include "cmd-action/cmd-pet.h"
 #include "core/hp-mp-regenerator.h"
 #include "core/player-redraw-types.h"
+#include "core/window-redrawer.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 5d2f8ad..a69b80d 100644 (file)
--- a/src/core/hp-mp-regenerator.c
+++ b/src/core/hp-mp-regenerator.c
@@ -2,6 +2,7 @@
 #include "cmd-item/cmd-magiceat.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "inventory/inventory-slot-types.h"
 #include "monster-race/monster-race.h"

diff --git a/src/core/player-processor.c b/src/core/player-processor.c
index 5f3d837..cc5f6f9 100644 (file)
--- a/src/core/player-processor.c
+++ b/src/core/player-processor.c
@@ -4,6 +4,7 @@
 #include "core/special-internal-keys.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-save.h"
 #include "floor/wild.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/core/window-redrawer.h b/src/core/window-redrawer.h
index 7c35014..4444251 100644 (file)
--- a/src/core/window-redrawer.h
+++ b/src/core/window-redrawer.h
@@ -2,6 +2,20 @@
 
 #include "system/angband.h"
 
+typedef enum window_redraw_type {
+    PW_INVEN = 0x00000001L, /*!<サブウィンドウ描画フラグ: 所持品-装備品 / Display inven/equip */
+    PW_EQUIP = 0x00000002L, /*!<サブウィンドウ描画フラグ: 装備品-所持品 / Display equip/inven */
+    PW_SPELL = 0x00000004L, /*!<サブウィンドウ描画フラグ: 魔法一覧 / Display spell list */
+    PW_PLAYER = 0x00000008L, /*!<サブウィンドウ描画フラグ: プレイヤーのステータス / Display character */
+    PW_MONSTER_LIST = 0x00000010L, /*!<サブウィンドウ描画フラグ: 視界内モンスターの一覧 / Display monster list */
+    PW_MESSAGE = 0x00000040L, /*!<サブウィンドウ描画フラグ: メッセージログ / Display messages */
+    PW_OVERHEAD = 0x00000080L, /*!<サブウィンドウ描画フラグ: 周辺の光景 / Display overhead view */
+    PW_MONSTER = 0x00000100L, /*!<サブウィンドウ描画フラグ: モンスターの思い出 / Display monster recall */
+    PW_OBJECT = 0x00000200L, /*!<サブウィンドウ描画フラグ: アイテムの知識 / Display object recall */
+    PW_DUNGEON = 0x00000400L, /*!<サブウィンドウ描画フラグ: ダンジョンの地形 / Display dungeon view */
+    PW_SNAPSHOT = 0x00000800L, /*!<サブウィンドウ描画フラグ: 記念写真 / Display snap-shot */
+} window_redraw_type;
+
 void redraw_window(void);
 void window_stuff(player_type *player_ptr);
 void redraw_stuff(player_type *creature_ptr);

diff --git a/src/dungeon/dungeon-processor.c b/src/dungeon/dungeon-processor.c
index a96fd51..1b9274e 100644 (file)
--- a/src/dungeon/dungeon-processor.c
+++ b/src/dungeon/dungeon-processor.c
@@ -7,6 +7,7 @@
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
 #include "core/turn-compensator.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-save.h"

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

diff --git a/src/effect/effect-monster.c b/src/effect/effect-monster.c
index 9e6ff28..ca894ee 100644 (file)
--- a/src/effect/effect-monster.c
+++ b/src/effect/effect-monster.c
@@ -7,6 +7,7 @@
 #include "effect/effect-monster.h"
 #include "core/player-redraw-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "effect/effect-monster-switcher.h"
 #include "floor/floor-object.h"

diff --git a/src/effect/effect-player-resist-hurt.c b/src/effect/effect-player-resist-hurt.c
index caa2495..ed458bf 100644 (file)
--- a/src/effect/effect-player-resist-hurt.c
+++ b/src/effect/effect-player-resist-hurt.c
@@ -3,6 +3,7 @@
 #include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "inventory/inventory-damage.h"
 #include "inventory/inventory-slot-types.h"
 #include "mind/mind-mirror-master.h"

diff --git a/src/effect/effect-player-spirit.c b/src/effect/effect-player-spirit.c
index 0341f70..a0ebc92 100644 (file)
--- a/src/effect/effect-player-spirit.c
+++ b/src/effect/effect-player-spirit.c
@@ -1,5 +1,6 @@
 #include "effect/effect-player-spirit.h"
 #include "core/player-redraw-types.h"
+#include "core/window-redrawer.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 a8f371a..6627b13 100644 (file)
--- a/src/floor/floor-events.c
+++ b/src/floor/floor-events.c
@@ -2,6 +2,7 @@
 #include "cmd-io/cmd-dump.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "game-option/birth-options.h"

diff --git a/src/floor/floor.c b/src/floor/floor.c
index f1c1f40..6afcf71 100644 (file)
--- a/src/floor/floor.c
+++ b/src/floor/floor.c
@@ -1,6 +1,7 @@
 #include "floor/floor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/grid/grid.c b/src/grid/grid.c
index 1160a3f..50fd5b8 100644 (file)
--- a/src/grid/grid.c
+++ b/src/grid/grid.c
@@ -16,6 +16,7 @@
  */
 
 #include "grid/grid.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/inventory/floor-item-getter.c b/src/inventory/floor-item-getter.c
index c963c32..97c7a65 100644 (file)
--- a/src/inventory/floor-item-getter.c
+++ b/src/inventory/floor-item-getter.c
@@ -6,6 +6,7 @@
 
 #include "inventory/floor-item-getter.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "floor/object-scanner.h"

diff --git a/src/inventory/inventory-object.c b/src/inventory/inventory-object.c
index 6cb1f90..eddb9ae 100644 (file)
--- a/src/inventory/inventory-object.c
+++ b/src/inventory/inventory-object.c
@@ -1,5 +1,6 @@
 #include "inventory/inventory-object.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-hook/hook-weapon.h"

diff --git a/src/inventory/item-getter.c b/src/inventory/item-getter.c
index bdc545d..1bb53cd 100644 (file)
--- a/src/inventory/item-getter.c
+++ b/src/inventory/item-getter.c
@@ -1,5 +1,6 @@
 #include "inventory/item-getter.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "game-option/input-options.h"
 #include "game-option/option-flags.h"

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

diff --git a/src/inventory/recharge-processor.c b/src/inventory/recharge-processor.c
index 4935435..514179c 100644 (file)
--- a/src/inventory/recharge-processor.c
+++ b/src/inventory/recharge-processor.c
@@ -1,5 +1,6 @@
 #include "inventory/recharge-processor.h"
 #include "core/hp-mp-regenerator.h"
+#include "core/window-redrawer.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-hook/hook-checker.h"
 #include "object/object-flavor.h"

diff --git a/src/io/targeting.c b/src/io/targeting.c
index db0ec1f..3f03c90 100644 (file)
--- a/src/io/targeting.c
+++ b/src/io/targeting.c
@@ -16,6 +16,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/spells-effect-util.h"

diff --git a/src/lore/lore-store.c b/src/lore/lore-store.c
index 64a6782..c8b9c7a 100644 (file)
--- a/src/lore/lore-store.c
+++ b/src/lore/lore-store.c
@@ -5,6 +5,7 @@
  */
 
 #include "lore/lore-store.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "monster-race/race-flags1.h"
 #include "monster-race/monster-race.h"

diff --git a/src/market/arena.c b/src/market/arena.c
index 6bf6136..6450841 100644 (file)
--- a/src/market/arena.c
+++ b/src/market/arena.c
@@ -3,6 +3,7 @@
 #include "core/show-file.h"
 #include "core/status-reseter.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "io/input-key-acceptor.h"

diff --git a/src/market/building-recharger.c b/src/market/building-recharger.c
index 27392d8..aa55a6c 100644 (file)
--- a/src/market/building-recharger.c
+++ b/src/market/building-recharger.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick.h"
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "inventory/inventory-slot-types.h"
 #include "market/building-util.h"

diff --git a/src/mind/mind-mindcrafter.c b/src/mind/mind-mindcrafter.c
index 12ce0b9..b4f959a 100644 (file)
--- a/src/mind/mind-mindcrafter.c
+++ b/src/mind/mind-mindcrafter.c
@@ -1,6 +1,7 @@
 #include "mind/mind-mindcrafter.h"
 #include "autopick/autopick.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "game-option/auto-destruction-options.h"
 #include "object-enchant/item-feeling.h"

diff --git a/src/mind/mind-sniper.c b/src/mind/mind-sniper.c
index 71e01aa..924ac18 100644 (file)
--- a/src/mind/mind-sniper.c
+++ b/src/mind/mind-sniper.c
@@ -11,6 +11,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "game-option/text-display-options.h"
 #include "grid/grid.h"

diff --git a/src/mind/mind.c b/src/mind/mind.c
index 537014b..2398821 100644 (file)
--- a/src/mind/mind.c
+++ b/src/mind/mind.c
@@ -23,6 +23,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "effect/spells-effect-util.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/mind/racial.c b/src/mind/racial.c
index 34bfc2c..ccf4f73 100644 (file)
--- a/src/mind/racial.c
+++ b/src/mind/racial.c
@@ -19,6 +19,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/spells-effect-util.h"
 #include "game-option/disturbance-options.h"
 #include "game-option/text-display-options.h"

diff --git a/src/monster-attack/monster-eating.c b/src/monster-attack/monster-eating.c
index 6381239..2822de0 100644 (file)
--- a/src/monster-attack/monster-eating.c
+++ b/src/monster-attack/monster-eating.c
@@ -7,6 +7,7 @@
 #include "monster-attack/monster-eating.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "inventory/inventory-object.h"
 #include "inventory/inventory-slot-types.h"

diff --git a/src/monster-floor/monster-move.c b/src/monster-floor/monster-move.c
index 6a660a0..938c174 100644 (file)
--- a/src/monster-floor/monster-move.c
+++ b/src/monster-floor/monster-move.c
@@ -7,6 +7,7 @@
 #include "monster-floor/monster-move.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "game-option/disturbance-options.h"
 #include "grid/feature.h"

diff --git a/src/monster/monster-status.c b/src/monster/monster-status.c
index fa021bf..d978b43 100644 (file)
--- a/src/monster/monster-status.c
+++ b/src/monster/monster-status.c
@@ -6,6 +6,7 @@
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"

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

diff --git a/src/mspell/mspell-dispel.c b/src/mspell/mspell-dispel.c
index 6d1b85f..18deab7 100644 (file)
--- a/src/mspell/mspell-dispel.c
+++ b/src/mspell/mspell-dispel.c
@@ -2,6 +2,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
+#include "core/window-redrawer.h"
 #include "mind/mind-force-trainer.h"
 #include "mind/mind-magic-resistance.h"
 #include "mind/mind-mirror-master.h"

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

diff --git a/src/object-enchant/artifact.c b/src/object-enchant/artifact.c
index 0f429dc..a6389f5 100644 (file)
--- a/src/object-enchant/artifact.c
+++ b/src/object-enchant/artifact.c
@@ -18,6 +18,7 @@
 #include "art-definition/random-art-effects.h"
 #include "cmd-item/cmd-smith.h"
 #include "core/asking-player.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/cheat-types.h"

diff --git a/src/object-hook/hook-expendable.c b/src/object-hook/hook-expendable.c
index 23fef53..41102aa 100644 (file)
--- a/src/object-hook/hook-expendable.c
+++ b/src/object-hook/hook-expendable.c
@@ -2,6 +2,7 @@
 #include "art-definition/art-accessory-types.h"
 #include "art-definition/art-armor-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "monster-race/monster-race.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/object-potion/quaff-execution.c b/src/object-potion/quaff-execution.c
index 8b18c1d..8b5cb1c 100644 (file)
--- a/src/object-potion/quaff-execution.c
+++ b/src/object-potion/quaff-execution.c
@@ -8,6 +8,7 @@
 #include "object-potion/quaff-execution.h"
 #include "birth/birth-stat.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "game-option/birth-options.h"
 #include "game-option/disturbance-options.h"
 #include "inventory/inventory-object.h"

diff --git a/src/object/lite-processor.c b/src/object/lite-processor.c
index 3914456..ff55802 100644 (file)
--- a/src/object/lite-processor.c
+++ b/src/object/lite-processor.c
@@ -1,5 +1,6 @@
 #include "object/lite-processor.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "game-option/disturbance-options.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/object-ego.h"

diff --git a/src/perception/simple-perception.c b/src/perception/simple-perception.c
index 2ad9eef..4fe71a1 100644 (file)
--- a/src/perception/simple-perception.c
+++ b/src/perception/simple-perception.c
@@ -7,6 +7,7 @@
 #include "perception/simple-perception.h"
 #include "autopick/autopick.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "game-option/auto-destruction-options.h"
 #include "game-option/disturbance-options.h"
 #include "inventory/inventory-describer.h"

diff --git a/src/pet/pet-fall-off.c b/src/pet/pet-fall-off.c
index 18bd402..77827de 100644 (file)
--- a/src/pet/pet-fall-off.c
+++ b/src/pet/pet-fall-off.c
@@ -8,6 +8,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "grid/feature.h"
 #include "io/targeting.h"

diff --git a/src/player/player-damage.c b/src/player/player-damage.c
index 3697839..022362b 100644 (file)
--- a/src/player/player-damage.c
+++ b/src/player/player-damage.c
@@ -6,6 +6,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "floor/wild.h"

diff --git a/src/player/player-move.c b/src/player/player-move.c
index 25530b3..ad5ab18 100644 (file)
--- a/src/player/player-move.c
+++ b/src/player/player-move.c
@@ -149,6 +149,7 @@
 #include "core/player-update-types.h"
 #include "core/special-internal-keys.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "effect/effect-characteristics.h"

diff --git a/src/player/player-status.c b/src/player/player-status.c
index 9db5893..6d1c6da 100644 (file)
--- a/src/player/player-status.c
+++ b/src/player/player-status.c
@@ -15,6 +15,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-events.h"

diff --git a/src/player/player-status.h b/src/player/player-status.h
index eb75e7d..30f2c70 100644 (file)
--- a/src/player/player-status.h
+++ b/src/player/player-status.h
@@ -363,18 +363,6 @@ typedef struct player_type
        BIT_FLAGS update;       /* Pending Updates */
        BIT_FLAGS redraw;       /* Normal Redraws */
        BIT_FLAGS window;       /* Window Redraws */
-#define PW_INVEN        0x00000001L     /*!<サブウィンドウ描画フラグ: 所持品-装備品 / Display inven/equip */
-#define PW_EQUIP        0x00000002L     /*!<サブウィンドウ描画フラグ: 装備品-所持品 / Display equip/inven */
-#define PW_SPELL        0x00000004L     /*!<サブウィンドウ描画フラグ: 魔法一覧 / Display spell list */
-#define PW_PLAYER       0x00000008L     /*!<サブウィンドウ描画フラグ: プレイヤーのステータス / Display character */
-#define PW_MONSTER_LIST 0x00000010L     /*!<サブウィンドウ描画フラグ: 視界内モンスターの一覧 / Display monster list */
-#define PW_MESSAGE      0x00000040L     /*!<サブウィンドウ描画フラグ: メッセージログ / Display messages */
-#define PW_OVERHEAD     0x00000080L     /*!<サブウィンドウ描画フラグ: 周辺の光景 / Display overhead view */
-#define PW_MONSTER      0x00000100L     /*!<サブウィンドウ描画フラグ: モンスターの思い出 / Display monster recall */
-#define PW_OBJECT       0x00000200L     /*!<サブウィンドウ描画フラグ: アイテムの知識 / Display object recall */
-#define PW_DUNGEON      0x00000400L     /*!<サブウィンドウ描画フラグ: ダンジョンの地形 / Display dungeon view */
-#define PW_SNAPSHOT     0x00000800L     /*!<サブウィンドウ描画フラグ: 記念写真 / Display snap-shot */
-
        s16b stat_use[A_MAX];   /* Current modified stats */
        s16b stat_top[A_MAX];   /* Maximal modified stats */
 

diff --git a/src/realm/realm-song.c b/src/realm/realm-song.c
index f8e33fa..a9c9344 100644 (file)
--- a/src/realm/realm-song.c
+++ b/src/realm/realm-song.c
@@ -2,6 +2,7 @@
 #include "core/hp-mp-processor.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "io/targeting.h"
 #include "player/attack-defense-types.h"

diff --git a/src/spell-kind/earthquake.c b/src/spell-kind/earthquake.c
index 8dc3f15..24d8cc4 100644 (file)
--- a/src/spell-kind/earthquake.c
+++ b/src/spell-kind/earthquake.c
@@ -1,6 +1,7 @@
 #include "spell-kind/earthquake.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-events.h"

diff --git a/src/spell-kind/spells-curse-removal.c b/src/spell-kind/spells-curse-removal.c
index 45052df..9335fba 100644 (file)
--- a/src/spell-kind/spells-curse-removal.c
+++ b/src/spell-kind/spells-curse-removal.c
@@ -1,5 +1,6 @@
 #include "spell-kind/spells-curse-removal.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/special-object-flags.h"

diff --git a/src/spell-kind/spells-detection.c b/src/spell-kind/spells-detection.c
index 5dbf6dc..768885c 100644 (file)
--- a/src/spell-kind/spells-detection.c
+++ b/src/spell-kind/spells-detection.c
@@ -1,4 +1,5 @@
 #include "spell-kind/spells-detection.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "floor/floor-save.h"
 #include "floor/floor.h"

diff --git a/src/spell-kind/spells-equipment.c b/src/spell-kind/spells-equipment.c
index e91ddaa..8ec696c 100644 (file)
--- a/src/spell-kind/spells-equipment.c
+++ b/src/spell-kind/spells-equipment.c
@@ -1,5 +1,6 @@
 #include "spell-kind/spells-equipment.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "inventory/inventory-slot-types.h"
 #include "mind/racial-android.h"
 #include "object-hook/hook-enchant.h"

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

diff --git a/src/spell-kind/spells-genocide.c b/src/spell-kind/spells-genocide.c
index 7337250..a4a753b 100644 (file)
--- a/src/spell-kind/spells-genocide.c
+++ b/src/spell-kind/spells-genocide.c
@@ -2,6 +2,7 @@
 #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"
 #include "floor/floor.h"
 #include "game-option/play-record-options.h"

diff --git a/src/spell-kind/spells-perception.c b/src/spell-kind/spells-perception.c
index 09c3d5e..0fad9dc 100644 (file)
--- a/src/spell-kind/spells-perception.c
+++ b/src/spell-kind/spells-perception.c
@@ -2,6 +2,7 @@
 #include "autopick/autopick.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "game-option/auto-destruction-options.h"
 #include "game-option/play-record-options.h"

diff --git a/src/spell-kind/spells-sight.c b/src/spell-kind/spells-sight.c
index 4e76936..b1f3d2d 100644 (file)
--- a/src/spell-kind/spells-sight.c
+++ b/src/spell-kind/spells-sight.c
@@ -1,6 +1,7 @@
 #include "spell-kind/spells-sight.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor.h"
 #include "game-option/birth-options.h"

diff --git a/src/spell-realm/spells-chaos.c b/src/spell-realm/spells-chaos.c
index 4c52a69..f15185f 100644 (file)
--- a/src/spell-realm/spells-chaos.c
+++ b/src/spell-realm/spells-chaos.c
@@ -1,6 +1,7 @@
 #include "spell-realm/spells-chaos.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "dungeon/quest.h"
 #include "floor/floor.h"
 #include "grid/feature.h"

diff --git a/src/spell-realm/spells-hex.c b/src/spell-realm/spells-hex.c
index ca55acf..bdb1a7a 100644 (file)
--- a/src/spell-realm/spells-hex.c
+++ b/src/spell-realm/spells-hex.c
@@ -2,6 +2,7 @@
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "monster-race/monster-race.h"
 #include "player/attack-defense-types.h"

diff --git a/src/spell-realm/spells-song.c b/src/spell-realm/spells-song.c
index 6fa66be..599d4c0 100644 (file)
--- a/src/spell-realm/spells-song.c
+++ b/src/spell-realm/spells-song.c
@@ -2,6 +2,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"
 #include "player/attack-defense-types.h"

diff --git a/src/spell-realm/spells-sorcery.c b/src/spell-realm/spells-sorcery.c
index 64594dd..159d825 100644 (file)
--- a/src/spell-realm/spells-sorcery.c
+++ b/src/spell-realm/spells-sorcery.c
@@ -1,6 +1,7 @@
 #include "spell-realm/spells-sorcery.h"
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
+#include "core/window-redrawer.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 ae91e41..2c4d023 100644 (file)
--- a/src/spell/spells-object.c
+++ b/src/spell/spells-object.c
@@ -11,6 +11,7 @@
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"
 #include "game-option/disturbance-options.h"

diff --git a/src/spell/spells-status.c b/src/spell/spells-status.c
index 1410c5f..c612290 100644 (file)
--- a/src/spell/spells-status.c
+++ b/src/spell/spells-status.c
@@ -11,6 +11,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "effect/effect-characteristics.h"
 #include "floor/floor-object.h"
 #include "floor/floor.h"

diff --git a/src/status/bad-status-setter.c b/src/status/bad-status-setter.c
index 1d4a722..918a86d 100644 (file)
--- a/src/status/bad-status-setter.c
+++ b/src/status/bad-status-setter.c
@@ -2,6 +2,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "game-option/disturbance-options.h"
 #include "mind/mind-sniper.h"
 #include "player/attack-defense-types.h"

diff --git a/src/status/base-status.c b/src/status/base-status.c
index 2fbef19..9cb3183 100644 (file)
--- a/src/status/base-status.c
+++ b/src/status/base-status.c
@@ -1,6 +1,7 @@
 #include "status/base-status.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "game-option/birth-options.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/item-feeling.h"

diff --git a/src/status/body-improvement.c b/src/status/body-improvement.c
index 1562ddc..63afa69 100644 (file)
--- a/src/status/body-improvement.c
+++ b/src/status/body-improvement.c
@@ -3,6 +3,7 @@
 #include "core/player-update-types.h"
 #include "core/speed-table.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "game-option/disturbance-options.h"
 #include "player/avatar.h"
 #include "player/player-move.h"

diff --git a/src/status/form-changer.c b/src/status/form-changer.c
index a95127a..9657fef 100644 (file)
--- a/src/status/form-changer.c
+++ b/src/status/form-changer.c
@@ -2,6 +2,7 @@
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "game-option/disturbance-options.h"
 #include "player/avatar.h"
 #include "player/player-move.h"

diff --git a/src/store/store.c b/src/store/store.c
index 9a98557..8a9f47d 100644 (file)
--- a/src/store/store.c
+++ b/src/store/store.c
@@ -32,6 +32,7 @@
 #include "core/asking-player.h"
 #include "core/player-redraw-types.h"
 #include "core/player-update-types.h"
+#include "core/window-redrawer.h"
 #include "mind/mind-sniper.h"
 #include "core/stuff-handler.h"
 #include "floor/floor-events.h"

diff --git a/src/view/display-messages.c b/src/view/display-messages.c
index 29bb084..c0b1f9a 100644 (file)
--- a/src/view/display-messages.c
+++ b/src/view/display-messages.c
@@ -1,5 +1,6 @@
 #include "view/display-messages.h"
 #include "core/output-updater.h"
+#include "core/window-redrawer.h"
 #include "game-option/cheat-options.h"
 #include "game-option/input-options.h"
 #include "game-option/map-screen-options.h"

diff --git a/src/view/display-sub-window-spells.c b/src/view/display-sub-window-spells.c
index 59173ca..302fb3f 100644 (file)
--- a/src/view/display-sub-window-spells.c
+++ b/src/view/display-sub-window-spells.c
@@ -1,4 +1,5 @@
 #include "view/display-sub-window-spells.h"
+#include "core/window-redrawer.h"
 #include "game-option/option-flags.h"
 #include "mind/mind-sniper.h"
 #include "mind/mind.h"

diff --git a/src/view/display-sub-windows.c b/src/view/display-sub-windows.c
index ef36608..8cb10e0 100644 (file)
--- a/src/view/display-sub-windows.c
+++ b/src/view/display-sub-windows.c
@@ -1,4 +1,5 @@
 #include "view/display-sub-windows.h"
+#include "core/window-redrawer.h"
 #include "floor/floor.h"
 #include "game-option/option-flags.h"
 #include "game-option/special-options.h"

diff --git a/src/wizard/wizard-special-process.c b/src/wizard/wizard-special-process.c
index b0447a7..63b5fc8 100644 (file)
--- a/src/wizard/wizard-special-process.c
+++ b/src/wizard/wizard-special-process.c
@@ -18,6 +18,7 @@
 #include "core/asking-player.h"
 #include "core/player-update-types.h"
 #include "core/stuff-handler.h"
+#include "core/window-redrawer.h"
 #include "dungeon/dungeon.h"
 #include "dungeon/quest.h"
 #include "floor/floor-object.h"