[Refactor] #38862 Moved view-mainwindow.c/h to display-main-window.c/h

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index e3199f6..7b48886 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -396,7 +396,7 @@
     <ClCompile Include="..\..\src\gameterm.c" />\r
     <ClCompile Include="..\..\src\trap.c" />\r
     <ClCompile Include="..\..\src\util.c" />\r
-    <ClCompile Include="..\..\src\view\view-mainwindow.c" />\r
+    <ClCompile Include="..\..\src\view\display-main-window.c" />\r
     <ClCompile Include="..\..\src\warning.c" />\r
     <ClCompile Include="..\..\src\wild.c" />\r
     <ClCompile Include="..\..\src\wizard1.c" />\r
@@ -589,7 +589,7 @@
     <ClInclude Include="..\..\src\gameterm.h" />\r
     <ClInclude Include="..\..\src\trap.h" />\r
     <ClInclude Include="..\..\src\util.h" />\r
-    <ClInclude Include="..\..\src\view\view-mainwindow.h" />\r
+    <ClInclude Include="..\..\src\view\display-main-window.h" />\r
     <ClInclude Include="..\..\src\warning.h" />\r
     <ClInclude Include="..\..\src\wild.h" />\r
     <ClInclude Include="..\..\src\world.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 5df95e9..c0e08bf 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -652,7 +652,7 @@
     <ClCompile Include="..\..\src\io\uid-checker.c">
       <Filter>io</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\view\view-mainwindow.c">
+    <ClCompile Include="..\..\src\view\display-main-window.c">
       <Filter>view</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1310,7 +1310,7 @@
     <ClInclude Include="..\..\src\io\uid-checker.h">
       <Filter>io</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\view\view-mainwindow.h">
+    <ClInclude Include="..\..\src\view\display-main-window.h">
       <Filter>view</Filter>
     </ClInclude>
   </ItemGroup>

diff --git a/src/artifact.c b/src/artifact.c
index b19fc28..460df45 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -30,7 +30,7 @@
 #include "files.h"
 #include "grid.h"
 #include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 #include "player-personality.h"
 #include "world.h"

diff --git a/src/autopick/autopick.c b/src/autopick/autopick.c
index 9183320..1fb63d2 100644 (file)
--- a/src/autopick/autopick.c
+++ b/src/autopick/autopick.c
@@ -50,7 +50,7 @@
 #include "world.h"
 #include "monster.h"
 #include "monsterrace.h"
-#include "view-mainwindow.h" // 暫定。後で消す
+#include "view/display-main-window.h" // 暫定。後で消す
 
 /*
  * Automatically destroy an item if it is to be destroyed

diff --git a/src/birth.c b/src/birth.c
index 9ab8650..f7e6bc3 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -57,7 +57,7 @@
 #include "save.h"
 #include "realm.h"
 #include "japanese.h"
-#include "view-mainwindow.h" // 暫定。後で消す.
+#include "view/display-main-window.h" // 暫定。後で消す.
 
  /*
   * The last character rolled,

diff --git a/src/cmd/cmd-basic.c b/src/cmd/cmd-basic.c
index cd7c86f..4cb6eb0 100644 (file)
--- a/src/cmd/cmd-basic.c
+++ b/src/cmd/cmd-basic.c
@@ -47,7 +47,7 @@
 #include "dungeon-file.h"
 #include "files.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "targeting.h"
 #include "world.h"
 

diff --git a/src/cmd/cmd-draw.c b/src/cmd/cmd-draw.c
index 2e4d9cf..952012f 100644 (file)
--- a/src/cmd/cmd-draw.c
+++ b/src/cmd/cmd-draw.c
@@ -3,7 +3,7 @@
 #include "cmd/cmd-draw.h"
 #include "files.h"
 #include "gameterm.h"
-#include "view-mainwindow.h" // 暫定。後で消す.
+#include "view/display-main-window.h" // 暫定。後で消す.
 #include "player-effects.h"
 #include "view/display-player.h" // 暫定。後で消す.
 #include "player/process-name.h"

diff --git a/src/cmd/cmd-eat.c b/src/cmd/cmd-eat.c
index 74f7814..d853aab 100644 (file)
--- a/src/cmd/cmd-eat.c
+++ b/src/cmd/cmd-eat.c
@@ -24,7 +24,7 @@
 #include "player-inventory.h"
 #include "floor.h"
 #include "object/object-kind.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*!
   * @brief 食料を食べるコマンドのサブルーチン

diff --git a/src/cmd/cmd-gameoption.c b/src/cmd/cmd-gameoption.c
index c5302ca..d58db90 100644 (file)
--- a/src/cmd/cmd-gameoption.c
+++ b/src/cmd/cmd-gameoption.c
@@ -4,7 +4,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-gameoption.h"
 #include "gameterm.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "cmd/cmd-dump.h"
 #include "core/show-file.h"
 #include "files.h"

diff --git a/src/cmd/cmd-hissatsu.c b/src/cmd/cmd-hissatsu.c
index 7ec16b0..a31c916 100644 (file)
--- a/src/cmd/cmd-hissatsu.c
+++ b/src/cmd/cmd-hissatsu.c
@@ -23,7 +23,7 @@
 
 #include "cmd-basic.h"
 #include "cmd-spell.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #define TECHNIC_HISSATSU (REALM_HISSATSU - MIN_TECHNIC)
 

diff --git a/src/cmd/cmd-item.c b/src/cmd/cmd-item.c
index 70fa9a9..90cecb6 100644 (file)
--- a/src/cmd/cmd-item.c
+++ b/src/cmd/cmd-item.c
@@ -41,14 +41,14 @@
 #include "player-class.h"
 #include "player-personality.h"
 #include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "spells.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "targeting.h"
 #include "snipe.h"
 #include "player-race.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-inventory.h"
 
 /*!

diff --git a/src/cmd/cmd-mane.c b/src/cmd/cmd-mane.c
index 664db28..cb3d0e0 100644 (file)
--- a/src/cmd/cmd-mane.c
+++ b/src/cmd/cmd-mane.c
@@ -28,7 +28,7 @@
 #include "player-effects.h"
 #include "cmd-basic.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 static int damage;
 

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index e9e719e..513c69e 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -19,7 +19,7 @@
 #include "monster-status.h"
 #include "cmd-pet.h"
 #include "cmd-basic.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "targeting.h"
 #include "world.h"
 

diff --git a/src/cmd/cmd-quaff.c b/src/cmd/cmd-quaff.c
index 31399e4..37b2143 100644 (file)
--- a/src/cmd/cmd-quaff.c
+++ b/src/cmd/cmd-quaff.c
@@ -28,7 +28,7 @@
 #include "cmd-basic.h"
 #include "floor.h"
 #include "object/object-kind.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 
 /*!

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index 402518f..9a76a8e 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -33,7 +33,7 @@
 #include "files.h"
 #include "floor.h"
 #include "object/object-kind.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
  * @brief 巻物を読むコマンドのサブルーチン

diff --git a/src/cmd/cmd-smith.c b/src/cmd/cmd-smith.c
index 455cc1a..cb1c6a3 100644 (file)
--- a/src/cmd/cmd-smith.c
+++ b/src/cmd/cmd-smith.c
@@ -10,7 +10,7 @@
 #include "cmd-smith.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-inventory.h"
 
 

diff --git a/src/cmd/cmd-spell.c b/src/cmd/cmd-spell.c
index a81495f..4c5c7dc 100644 (file)
--- a/src/cmd/cmd-spell.c
+++ b/src/cmd/cmd-spell.c
@@ -28,7 +28,7 @@
 #include "player-inventory.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "floor.h"
 #include "autopick/autopick.h"
 #include "japanese.h"

diff --git a/src/cmd/cmd-usestaff.c b/src/cmd/cmd-usestaff.c
index d168f4b..7e56381 100644 (file)
--- a/src/cmd/cmd-usestaff.c
+++ b/src/cmd/cmd-usestaff.c
@@ -16,7 +16,7 @@
 #include "cmd-basic.h"
 #include "floor.h"
 #include "object/object-kind.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 
 /*!

diff --git a/src/cmd/cmd-visuals.c b/src/cmd/cmd-visuals.c
index 0e067d4..34904ff 100644 (file)
--- a/src/cmd/cmd-visuals.c
+++ b/src/cmd/cmd-visuals.c
@@ -10,7 +10,7 @@
 #include "gameterm.h"
 #include "cmd/lighting-level-table.h"
 #include "io/read-pref-file.h"
-#include "view-mainwindow.h" // 暫定。後で消す.
+#include "view/display-main-window.h" // 暫定。後で消す.
 
 /*!
  * @brief キャラクタのビジュアルIDを変更する際の対象指定関数

diff --git a/src/cmd/cmd-zaprod.c b/src/cmd/cmd-zaprod.c
index 937a628..dff68fd 100644 (file)
--- a/src/cmd/cmd-zaprod.c
+++ b/src/cmd/cmd-zaprod.c
@@ -15,7 +15,7 @@
 #include "cmd-basic.h"
 #include "floor.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
  * @brief ロッドの効果を発動する

diff --git a/src/cmd/cmd-zapwand.c b/src/cmd/cmd-zapwand.c
index 54e3b18..660489e 100644 (file)
--- a/src/cmd/cmd-zapwand.c
+++ b/src/cmd/cmd-zapwand.c
@@ -14,7 +14,7 @@
 #include "cmd-basic.h"
 #include "floor.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
 * @brief 魔法棒の効果を発動する

diff --git a/src/combat/melee.c b/src/combat/melee.c
index c5ce785..00e24fe 100644 (file)
--- a/src/combat/melee.c
+++ b/src/combat/melee.c
@@ -42,7 +42,7 @@
 #include "player/mimic-info-table.h"
 #include "player-class.h"
 #include "player-personality.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 #include "spells-floor.h"
 

diff --git a/src/combat/shoot.c b/src/combat/shoot.c
index 1bdf09a..cccebc0 100644 (file)
--- a/src/combat/shoot.c
+++ b/src/combat/shoot.c
@@ -22,7 +22,7 @@
 
 #include "shoot.h"
 #include "snipe.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "object/object-kind.h"
 #include "targeting.h"
 

diff --git a/src/core.c b/src/core.c
index a9b69d9..b8e596d 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -98,7 +98,7 @@
 #include "player-skill.h"
 #include "player-inventory.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "dungeon-file.h"
 #include "io/uid-checker.h"
 #include "player/process-death.h"

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 4ad2326..042227a 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -62,7 +62,7 @@
 #include "cmd-activate.h"
 #include "gameterm.h"
 #include "wild.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 
 #include "init.h"

diff --git a/src/floor-events.c b/src/floor-events.c
index 473eb71..4a2039f 100644 (file)
--- a/src/floor-events.c
+++ b/src/floor-events.c
@@ -15,7 +15,7 @@
 #include "object/object-kind.h"
 #include "object-ego.h"
 #include "cmd-dump.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 static bool mon_invis;
 static POSITION mon_fy, mon_fx;

diff --git a/src/floor-generate.c b/src/floor-generate.c
index ce78e00..52cd389 100644 (file)
--- a/src/floor-generate.c
+++ b/src/floor-generate.c
@@ -126,7 +126,7 @@
 #include "spells.h"
 
 #include "world.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 int dun_tun_rnd; 
 int dun_tun_chg;

diff --git a/src/floor-save.c b/src/floor-save.c
index a9e4d72..308d44c 100644 (file)
--- a/src/floor-save.c
+++ b/src/floor-save.c
@@ -44,7 +44,7 @@
 #include "cmd/cmd-dump.h"
 #include "save.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 static FLOOR_IDX new_floor_id;  /*!<次のフロアのID / floor_id of the destination */
 static u32b latest_visit_mark;  /*!<フロアを渡った回数？(確認中) / Max number of visit_mark */

diff --git a/src/grid.c b/src/grid.c
index fa34145..1ac8e66 100644 (file)
--- a/src/grid.c
+++ b/src/grid.c
@@ -35,7 +35,7 @@
 #include "player-effects.h"
 #include "player-class.h"
 #include "spells.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "realm-song.h"
 
 #define MONSTER_FLOW_DEPTH 32 /*!< 敵のプレイヤーに対する移動道のりの最大値(この値以上は処理を打ち切る) / OPTION: Maximum flow depth when using "MONSTER_FLOW" */

diff --git a/src/io/interpret-pref-file.c b/src/io/interpret-pref-file.c
index b9601f2..e61241e 100644 (file)
--- a/src/io/interpret-pref-file.c
+++ b/src/io/interpret-pref-file.c
@@ -11,7 +11,7 @@
 #include "birth.h"
 #include "world.h"
 #include "gameterm.h"
-#include "view-mainwindow.h" // 暫定。apply_default_feat_lighting()。後で消す.
+#include "view/display-main-window.h" // 暫定。apply_default_feat_lighting()。後で消す.
 
 #define MAX_MACRO_CHARS 65536 // 1つのマクロキー押下で実行可能なコマンド最大数 (エスケープシーケンス含む).
 

diff --git a/src/knowledge/knowledge-features.c b/src/knowledge/knowledge-features.c
index e8fca70..31e8043 100644 (file)
--- a/src/knowledge/knowledge-features.c
+++ b/src/knowledge/knowledge-features.c
@@ -12,7 +12,7 @@
 #include "world.h"
 #include "cmd/lighting-level-table.h"
 #include "dungeon.h"
-#include "view-mainwindow.h" // 暫定、後で消す.
+#include "view/display-main-window.h" // 暫定、後で消す.
 
  /*
   * Build a list of feature indexes in the given group. Return the number

diff --git a/src/knowledge/knowledge-items.c b/src/knowledge/knowledge-items.c
index 520e4f2..d86a01d 100644 (file)
--- a/src/knowledge/knowledge-items.c
+++ b/src/knowledge/knowledge-items.c
@@ -17,7 +17,7 @@
 #include "world.h"
 #include "gameterm.h"
 #include "core.h" // 暫定、後で消す.
-#include "view-mainwindow.h" // 暫定、後で消す.
+#include "view/display-main-window.h" // 暫定、後で消す.
 
 /*
  * todo okay = 既知のアーティファクト？ と思われるが確証がない

diff --git a/src/knowledge/knowledge-monsters.c b/src/knowledge/knowledge-monsters.c
index 15e90e9..c8396ad 100644 (file)
--- a/src/knowledge/knowledge-monsters.c
+++ b/src/knowledge/knowledge-monsters.c
@@ -17,7 +17,7 @@
 #include "english.h"
 
 #include "core.h" // 暫定、後で消す.
-#include "view-mainwindow.h" // 暫定、後で消す.
+#include "view/display-main-window.h" // 暫定、後で消す.
 
  /*
   * todo 引数と戻り値について追記求む

diff --git a/src/main-win.c b/src/main-win.c
index 4f70ff5..80f3c03 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -100,7 +100,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-process-screen.h"
 #include "cmd/cmd-save.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "floor.h"
 #include "floor-events.h"
 #include "init.h"

diff --git a/src/market/building.c b/src/market/building.c
index db613e9..5e4fce4 100644 (file)
--- a/src/market/building.c
+++ b/src/market/building.c
@@ -57,7 +57,7 @@
 #include "player-inventory.h"
 #include "scores.h"
 #include "shoot.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "monsterrace.h"
 #include "autopick/autopick.h"
 

diff --git a/src/market/store.c b/src/market/store.c
index b1c6c14..de75616 100644 (file)
--- a/src/market/store.c
+++ b/src/market/store.c
@@ -59,7 +59,7 @@
 #include "autopick/autopick.h"
 #include "floor-town.h"
 #include "japanese.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "wild.h"
 
 #define MIN_STOCK 12

diff --git a/src/mind.c b/src/mind.c
index 72976d0..174317f 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -38,7 +38,7 @@
 #include "monster-status.h"
 #include "player-effects.h"
 #include "player-damage.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "targeting.h"
 #include "realm-song.h"
 

diff --git a/src/monster-status.c b/src/monster-status.c
index d369c85..2a12f7e 100644 (file)
--- a/src/monster-status.c
+++ b/src/monster-status.c
@@ -23,7 +23,7 @@
 #include "files.h"
 #include "player-effects.h"
 #include "player-personality.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 #include "report.h"
 #include "melee.h"

diff --git a/src/monster1.c b/src/monster1.c
index cb8d430..15b67ef 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -36,7 +36,7 @@
 #include "world.h"
 #include "melee.h"
 #include "japanese.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 #include "english.h"
 #include "market/arena-info-table.h"

diff --git a/src/monster2.c b/src/monster2.c
index 4bbb0f0..2f6b4a4 100644 (file)
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -37,7 +37,7 @@
 #include "warning.h"
 #include "monster-spell.h"
 #include "files.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 #include "monsterrace.h"
 #include "creature.h"

diff --git a/src/mspells1.c b/src/mspells1.c
index 315ee19..62243e6 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -54,7 +54,7 @@
 #include "spells.h"
 #include "world.h"
 #include "realm-song.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-race.h"
 #include "player-class.h"
 

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

diff --git a/src/mspells3.c b/src/mspells3.c
index 47f2f86..c3f791d 100644 (file)
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -28,7 +28,7 @@
 #include "cmd-basic.h"
 #include "player-effects.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*!
   * @brief モンスター魔法をプレイヤーが使用する場合の換算レベル

diff --git a/src/mspells4.c b/src/mspells4.c
index a7094d9..4171dcb 100644 (file)
--- a/src/mspells4.c
+++ b/src/mspells4.c
@@ -25,7 +25,7 @@
 #include "melee.h"
 #include "player-effects.h"
 #include "world.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*!
  * @brief モンスター2体がプレイヤーの近くに居るかの判定 /

diff --git a/src/object-hook.c b/src/object-hook.c
index a3b77b5..90a4317 100644 (file)
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -11,7 +11,7 @@
 #include "quest.h"
 #include "world.h"
 #include "object/object-kind.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
 * @brief 対象のアイテムが矢やクロスボウの矢の材料になるかを返す。/

diff --git a/src/object1.c b/src/object1.c
index 2004ca9..36a8829 100644 (file)
--- a/src/object1.c
+++ b/src/object1.c
@@ -31,7 +31,7 @@
 #include "gameterm.h"
 #include "cmd-smith.h"
 #include "snipe.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #if defined(MACH_O_CARBON)
 #ifdef verify

diff --git a/src/object2.c b/src/object2.c
index 93e72ad..07b95ed 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -43,7 +43,7 @@
 #include "monster.h"
 #include "monsterrace-hook.h"
 #include "object-ego.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*
   * todo この説明長すぎ。何とかしたい

diff --git a/src/player-damage.c b/src/player-damage.c
index 4c0c872..0b1a0d0 100644 (file)
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -25,7 +25,7 @@
 #include "player-race.h"
 #include "monster-spell.h"
 #include "world.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "quest.h"
 #include "report.h"
 #include "wild.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 6434718..dcb1823 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -54,7 +54,7 @@
 #include "save.h"
 #include "report.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*!
   * @brief 修行僧の構え能力テーブル

diff --git a/src/player-inventory.c b/src/player-inventory.c
index 5d81477..8e9aa66 100644 (file)
--- a/src/player-inventory.c
+++ b/src/player-inventory.c
@@ -11,7 +11,7 @@
 #include "floor.h"
 #include "player-move.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 bool select_ring_slot;
 

diff --git a/src/player-move.c b/src/player-move.c
index 1d83c13..120aaeb 100644 (file)
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -170,7 +170,7 @@
 #include "object-flavor.h"
 #include "spells.h"
 #include "cmd-basic.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 #include "object/object-kind.h"
 #include "autopick/autopick.h"

diff --git a/src/player-status.c b/src/player-status.c
index b700494..78c8692 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -41,7 +41,7 @@
 #include "cmd/cmd-dump.h"
 #include "melee.h"
 #include "world.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "files.h"
 #include "cmd-magiceat.h"
 

diff --git a/src/quest.c b/src/quest.c
index 958df8a..b555048 100644 (file)
--- a/src/quest.c
+++ b/src/quest.c
@@ -19,7 +19,7 @@
 #include "io/write-diary.h"
 #include "cmd/cmd-dump.h"
 #include "english.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 quest_type *quest; /*!< Quest info */
 QUEST_IDX max_q_idx; /*!< Maximum number of quests */

diff --git a/src/racial.c b/src/racial.c
index 60eec79..34090a2 100644 (file)
--- a/src/racial.c
+++ b/src/racial.c
@@ -34,7 +34,7 @@
 #include "cmd-spell.h"
 #include "realm-hex.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "player-class.h"
 
 /*!

diff --git a/src/realm-chaos.c b/src/realm-chaos.c
index 56d24bc..fb3294e 100644 (file)
--- a/src/realm-chaos.c
+++ b/src/realm-chaos.c
@@ -11,7 +11,7 @@
 #include "spells-diceroll.h"
 #include "spells.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
 * @brief カオス領域魔法の各処理を行う

diff --git a/src/realm-hex.c b/src/realm-hex.c
index 45a0607..0894ccd 100644 (file)
--- a/src/realm-hex.c
+++ b/src/realm-hex.c
@@ -35,7 +35,7 @@
 #include "monsterrace.h"
 #include "targeting.h"
 #include "realm-song.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 
 #define MAX_KEEP 4 /*!<呪術の最大詠唱数 */

diff --git a/src/realm-hissatsu.c b/src/realm-hissatsu.c
index e8a7178..cad6e44 100644 (file)
--- a/src/realm-hissatsu.c
+++ b/src/realm-hissatsu.c
@@ -18,7 +18,7 @@
 #include "spells.h"
 #include "grid.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "spells-floor.h"
 #include "world.h"
 

diff --git a/src/realm-song.c b/src/realm-song.c
index 0190d81..945df07 100644 (file)
--- a/src/realm-song.c
+++ b/src/realm-song.c
@@ -10,7 +10,7 @@
 #include "player-class.h"
 #include "player-effects.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
 * @brief 歌の開始を処理する / Start singing if the player is a Bard

diff --git a/src/save.c b/src/save.c
index 380b9fa..a5d91c6 100644 (file)
--- a/src/save.c
+++ b/src/save.c
@@ -36,7 +36,7 @@
 #include "monsterrace.h"
 #include "birth.h"
 #include "market/building.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
  /*
   * Some "local" parameters, used to help write savefiles

diff --git a/src/snipe.c b/src/snipe.c
index 06de21c..8e9e797 100644 (file)
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -16,7 +16,7 @@
 #include "cmd-basic.h"
 #include "snipe.h"
 #include "monsterrace.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #define MAX_SNIPE_POWERS 16
 

diff --git a/src/spells-floor.c b/src/spells-floor.c
index a3c7d0f..21a0855 100644 (file)
--- a/src/spells-floor.c
+++ b/src/spells-floor.c
@@ -20,7 +20,7 @@
 #include "player-effects.h"
 #include "player-move.h"
 #include "feature.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #include "monster-status.h"
 

diff --git a/src/spells-object.c b/src/spells-object.c
index 76529fa..e58b909 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -21,7 +21,7 @@
 #include "object/object-kind.h"
 #include "autopick/autopick.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 
 typedef struct

diff --git a/src/spells-status.c b/src/spells-status.c
index ae5942c..2f298f2 100644 (file)
--- a/src/spells-status.c
+++ b/src/spells-status.c
@@ -16,7 +16,7 @@
 #include "object/object-kind.h"
 #include "targeting.h"
 #include "realm-song.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 /*!
  * @brief モンスター回復処理

diff --git a/src/spells1.c b/src/spells1.c
index 8fbaff4..41e4fdc 100644 (file)
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -52,7 +52,7 @@
 #include "gameterm.h"
 #include "grid.h"
 #include "feature.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "dungeon.h"
 
 #include "realm.h"

diff --git a/src/spells2.c b/src/spells2.c
index 418540c..2847d5b 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -53,7 +53,7 @@
 #include "dungeon.h"
 #include "floor-events.h"
 #include "feature.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "object/object-kind.h"
 #include "monsterrace.h"
 #include "targeting.h"

diff --git a/src/spells3.c b/src/spells3.c
index 0d736af..34e5f5f 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -54,7 +54,7 @@
 #include "player-effects.h"
 #include "player-skill.h"
 #include "player-personality.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "mind.h"
 #include "wild.h"
 #include "world.h"

diff --git a/src/targeting.c b/src/targeting.c
index fcb3ee3..a41fc99 100644 (file)
--- a/src/targeting.c
+++ b/src/targeting.c
@@ -34,7 +34,7 @@
 #include "player-move.h"
 #include "player-status.h"
 #include "monster-status.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "feature.h"
 #include "quest.h"
 #include "dungeon.h"

diff --git a/src/util.c b/src/util.c
index 4d3679b..5e18c02 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -18,7 +18,7 @@
 #include "util.h"
 #include "files.h"
 #include "monsterrace-hook.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "quest.h"
 #include "floor.h"
 #include "world.h"

diff --git a/src/view/view-mainwindow.c b/src/view/display-main-window.c
similarity index 99%
rename from src/view/view-mainwindow.c
rename to src/view/display-main-window.c
index 262b7f5..696be19 100644 (file)
--- a/src/view/view-mainwindow.c
+++ b/src/view/display-main-window.c
@@ -31,7 +31,7 @@
 #include "player-effects.h"
 #include "player-inventory.h"
 #include "monster.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #include "spells.h"
 #include "realm-hex.h"

diff --git a/src/view/view-mainwindow.h b/src/view/display-main-window.h
similarity index 100%
rename from src/view/view-mainwindow.h
rename to src/view/display-main-window.h

diff --git a/src/wild.c b/src/wild.c
index 9ff7829..1e70143 100644 (file)
--- a/src/wild.c
+++ b/src/wild.c
@@ -32,7 +32,7 @@
 #include "floor-town.h"
 #include "realm.h"
 
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 
 #define MAX_FEAT_IN_TERRAIN 18
 

diff --git a/src/wizard2.c b/src/wizard2.c
index 289a01a..16facc6 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -53,7 +53,7 @@
 #include "market/building.h"
 #include "object/object-kind.h"
 #include "targeting.h"
-#include "view-mainwindow.h"
+#include "view/display-main-window.h"
 #include "world.h"
 
 #define NUM_O_SET 8