[Refactor] #37353 再描画フラグ PR_* 定義を view-mainwindow.h へ移動．

diff --git a/src/birth.c b/src/birth.c
index 5ff19fd..ae69455 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -49,6 +49,7 @@
 #include "save.h"
 #include "realm.h"
 #include "japanese.h"
+#include "view-mainwindow.h"
 
  /*
   * The last character rolled,

diff --git a/src/cmd-hissatsu.c b/src/cmd-hissatsu.c
index ba14d6f..f7ea24d 100644 (file)
--- a/src/cmd-hissatsu.c
+++ b/src/cmd-hissatsu.c
@@ -21,6 +21,7 @@
 
 #include "cmd-basic.h"
 #include "cmd-spell.h"
+#include "view-mainwindow.h"
 
 #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC)
 

diff --git a/src/cmd-mane.c b/src/cmd-mane.c
index 02dd29f..0d8c004 100644 (file)
--- a/src/cmd-mane.c
+++ b/src/cmd-mane.c
@@ -27,6 +27,7 @@
 #include "player-effects.h"
 #include "cmd-basic.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 static int damage;
 

diff --git a/src/cmd-read.c b/src/cmd-read.c
index db9c441..7ec84c0 100644 (file)
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -29,6 +29,7 @@
 #include "floor.h"
 #include "objectkind.h"
 #include "realm-song.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief 巻物を読むコマンドのサブルーチン

diff --git a/src/defines.h b/src/defines.h
index 2c2f9c0..8ee4185 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -1168,42 +1168,6 @@
 
 
 /*
- * Bit flags for the "p_ptr->redraw" variable
- */
-#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 */
-/* xxx */
-/* xxx */
-/* xxx */
-/* xxx */
-
-/*
  * Bit flags for the "p_ptr->window" variable (etc)
  */
 #define PW_INVEN        0x00000001L     /*!<サブウィンドウ描画フラグ: 所持品-装備品 / Display inven/equip */

diff --git a/src/floor-events.c b/src/floor-events.c
index e1c8df0..ee42477 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -15,6 +15,7 @@
 #include "objectkind.h"
 #include "object-ego.h"
 #include "cmd-dump.h"
+#include "view-mainwindow.h"
 
 static bool mon_invis;
 static POSITION mon_fy, mon_fx;

diff --git a/src/monster-process.c b/src/monster-process.c
index cb701af..45bfd8e 100644 (file)
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -37,6 +37,7 @@
 #include "dungeon.h"
 #include "floor.h"
 #include "files.h"
+#include "view-mainwindow.h"
 
 
 /*!

diff --git a/src/monster1.c b/src/monster1.c
index 9e13238..e880bf1 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -33,6 +33,7 @@
 #include "world.h"
 #include "melee.h"
 #include "japanese.h"
+#include "view-mainwindow.h"
 
 
 /*

diff --git a/src/mspells1.c b/src/mspells1.c
index c36f59d..8d49e3e 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -54,6 +54,7 @@
 #include "spells.h"
 #include "world.h"
 #include "realm-song.h"
+#include "view-mainwindow.h"
 
 
 /*!

diff --git a/src/mspells2.c b/src/mspells2.c
index 5a41c53..cb18fea 100644 (file)
--- a/src/mspells2.c
+++ b/src/mspells2.c
@@ -26,6 +26,7 @@
 #include "spells.h"
 #include "dungeon.h"
 #include "world.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief モンスターが敵対モンスターにビームを当てること可能かを判定する /

diff --git a/src/mspells3.c b/src/mspells3.c
index 7c3a2c2..a6aafd0 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -27,6 +27,7 @@
 #include "cmd-basic.h"
 #include "player-effects.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 #define pseudo_plev() (((p_ptr->lev + 40) * (p_ptr->lev + 40) - 1550) / 130) /*!< モンスター魔法をプレイヤーが使用する場合の換算レベル */
 

diff --git a/src/mspells4.c b/src/mspells4.c
index b19a5ea..e411b55 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -22,6 +22,7 @@
 #include "melee.h"
 #include "player-effects.h"
 #include "world.h"
+#include "view-mainwindow.h"
 
 
 

diff --git a/src/object1.c b/src/object1.c
index 418e36c..cf2d138 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -27,6 +27,7 @@
 #include "files.h"
 #include "term.h"
 #include "cmd-smith.h"
+#include "view-mainwindow.h"
 
 #if defined(MACINTOSH) || defined(MACH_O_CARBON)
 #ifdef verify

diff --git a/src/object2.c b/src/object2.c
index 0648a9a..e050f27 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -39,6 +39,7 @@
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object-ego.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief 床上、モンスター所持でスタックされたアイテムを削除しスタックを補完する / Excise a dungeon object from any stacks

diff --git a/src/player-effects.c b/src/player-effects.c
index 283a5d0..f2a72e6 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -53,6 +53,8 @@
 #include "save.h"
 #include "report.h"
 
+#include "view-mainwindow.h"
+
  /*!
   * @brief 修行僧の構え能力テーブル
   */

diff --git a/src/player-status.c b/src/player-status.c
index 0a0ac94..775915e 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -37,6 +37,7 @@
 #include "cmd-dump.h"
 #include "melee.h"
 #include "world.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief 能力値テーブル / Abbreviations of healthy stats

diff --git a/src/racial.c b/src/racial.c
index afacb6c..55aa526 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -33,6 +33,7 @@
 #include "cmd-spell.h"
 #include "realm-hex.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief 修行僧の構え設定処理

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 91a81a4..2278ce3 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -7,6 +7,7 @@
 #include "spells-status.h"
 #include "spells.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 /*!
 * @brief カオス領域魔法の各処理を行う

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 3d96f6d..720e97d 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -34,6 +34,7 @@
 #include "monsterrace.h"
 #include "targeting.h"
 #include "realm-song.h"
+#include "view-mainwindow.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */
 

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index 739613e..8b21b7c 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -17,6 +17,7 @@
 #include "spells.h"
 #include "grid.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 /*!
 * @brief 剣術の各処理を行う

diff --git a/src/realm-song.c b/src/realm-song.c
index 1138bed..9e96335 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -9,6 +9,7 @@
 #include "spells-floor.h"
 #include "player-effects.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard

diff --git a/src/report.c b/src/report.c
index 54473d2..154aeff 100644 (file)
--- a/src/report.c
+++ b/src/report.c
@@ -20,6 +20,7 @@
 #include "world.h"
 #include "realm.h"
 #include "term.h"
+#include "view-mainwindow.h"
 
 #ifdef WORLD_SCORE
 

diff --git a/src/snipe.c b/src/snipe.c
index 6515325..d0b5866 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -15,6 +15,7 @@
 #include "cmd-basic.h"
 #include "snipe.h"
 #include "monsterrace.h"
+#include "view-mainwindow.h"
 
 #define MAX_SNIPE_POWERS 16
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index 4762c27..94e5ea2 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -10,6 +10,7 @@
 #include "floor-save.h"
 #include "player-effects.h"
 #include "feature.h"
+#include "view-mainwindow.h"
 
 /*
  * Light up the dungeon using "clairvoyance"

diff --git a/src/spells-object.c b/src/spells-object.c
index 7ccc751..9863d97 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -18,6 +18,7 @@
 #include "objectkind.h"
 #include "autopick.h"
 #include "targeting.h"
+#include "view-mainwindow.h"
 
 
 typedef struct

diff --git a/src/spells-status.c b/src/spells-status.c
index 18f978a..d6b7b05 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -14,6 +14,7 @@
 #include "objectkind.h"
 #include "targeting.h"
 #include "realm-song.h"
+#include "view-mainwindow.h"
 
 /*!
  * @brief モンスター回復処理

diff --git a/src/store.c b/src/store.c
index 1c4977a..d2a86be 100644 (file)
--- a/src/store.c
+++ b/src/store.c
@@ -41,6 +41,7 @@
 #include "autopick.h"
 #include "floor-town.h"
 #include "japanese.h"
+#include "view-mainwindow.h"
 
 #define MIN_STOCK 12
 

diff --git a/src/view-mainwindow.h b/src/view-mainwindow.h
index 831f9db..d7a4b01 100644 (file)
--- a/src/view-mainwindow.h
+++ b/src/view-mainwindow.h
@@ -21,6 +21,39 @@ extern void redraw_window(void);
 extern bool change_panel(POSITION dy, POSITION dx);
 
 extern void window_stuff(void);
+
+
+/*
+ * Bit flags for the "redraw" variable
+ */
+#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 */
 extern void redraw_stuff(void);
 
 extern POSITION panel_row_min, panel_row_max;