Merge branch 'For2.2.2-Refactoring' into For2.2.2-Fix-Hourier

diff --cc Hengband_vcs2017/Hengband/Hengband.vcxproj
Simple merge

diff --cc Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
Simple merge

diff --cc src/Makefile.am
Simple merge

diff --cc src/birth.c
Simple merge

diff --cc src/combat/melee1.c
Simple merge

diff --cc src/core.c
Simple merge

diff --cc src/core/show-file.c
index 7b319e6,bc64fbf..29b18b3
--- 1/src/core/show-file.c
--- 2/src/core/show-file.c
+++ b/src/core/show-file.c
@@@ -1,10 -1,10 +1,10 @@@
  #include "core/show-file.h"
  #include "files.h"
  #include "core.h" // 暫定。後で消す.
- #include "term.h"
+ #include "gameterm.h"
  
  /*!
 - * @param 表示とそれ以外を分割する
 + * todo 表示とそれ以外を分割する
   * @brief ファイル内容の一行をコンソールに出力する
   * Display single line of on-line help file
   * @param str 出力する文字列

diff --cc src/dungeon-file.c
Simple merge

diff --cc src/init.c
index 0de6126,f506b57..8c096fe
--- 1/src/init.c
--- 2/src/init.c
+++ b/src/init.c
@@@ -36,10 -36,10 +36,10 @@@
  #include "files.h"
  #include "core.h"
  #include "io/read-pref-file.h"
- #include "term.h"
+ #include "gameterm.h"
  
  #include "artifact.h"
 -#include "bldg.h"
 +#include "market/building.h"
  #include "init.h"
  #include "quest.h"
  #include "trap.h"

diff --cc src/market/building.c
Simple merge

diff --cc src/monster1.c
Simple merge

diff --cc src/player-damage.c
index da989f1,42b4859..1fe704a
--- 1/src/player-damage.c
--- 2/src/player-damage.c
+++ b/src/player-damage.c
@@@ -1,13 -1,12 +1,13 @@@
  #include "angband.h"
  #include "core.h"
  #include "util.h"
- #include "term.h"
+ #include "gameterm.h"
  
  #include "avatar.h"
 -#include "bldg.h"
 +#include "market/building.h"
  #include "io/write-diary.h"
  #include "cmd/cmd-dump.h"
 +#include "market/arena-info-table.h"
  #include "realm-song.h"
  #include "floor.h"
  #include "artifact.h"

diff --cc src/player-effects.c
Simple merge

diff --cc src/scores.c
Simple merge

diff --cc src/spells1.c
Simple merge

diff --cc src/spells3.c
index 7823313,3d42a80..655dd9b
--- 1/src/spells3.c
--- 2/src/spells3.c
+++ b/src/spells3.c
@@@ -12,9 -12,9 +12,9 @@@
   */
  
  #include "angband.h"
 -#include "bldg.h"
 +#include "market/building.h"
  #include "core.h"
- #include "term.h"
+ #include "gameterm.h"
  #include "util.h"
  #include "object-ego.h"
  

diff --cc src/store.c
Simple merge

diff --cc src/targeting.c
index 97c49aa,6a6e547..3b3e8a5
--- 1/src/targeting.c
--- 2/src/targeting.c
+++ b/src/targeting.c
@@@ -13,10 -13,10 +13,10 @@@
  #include "angband.h"
  #include "util.h"
  #include "core.h"
- #include "term.h"
+ #include "gameterm.h"
  #include "targeting.h"
  
 -#include "bldg.h"
 +#include "market/building.h"
  #include "cmd-pet.h"
  #include "dungeon-file.h"
  #include "object-curse.h"

diff --cc src/view-mainwindow.c
index 7ff12a2,31e7230..5a2b36a
--- 1/src/view-mainwindow.c
--- 2/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@@ -13,9 -13,9 +13,9 @@@
  #include "angband.h"
  #include "util.h"
  #include "autopick.h"
- #include "term.h"
+ #include "gameterm.h"
  
 -#include "bldg.h"
 +#include "market/building.h"
  #include "core.h"
  #include "files.h"
  #include "world.h"

diff --cc src/view/display-player-misc-info.c
index 1b418f4,392f0d2..2ca3c19
--- 1/src/view/display-player-misc-info.c
--- 2/src/view/display-player-misc-info.c
+++ b/src/view/display-player-misc-info.c
@@@ -1,9 -1,7 +1,9 @@@
 -#include "view/display-player-stat-info.h"
 +#include "angband.h"
 +#include "view/display-player-stat-info.h"
 +#include "player/mimic-info-table.h"
  #include "player-personality.h"
  #include "player-sex.h"
- #include "term.h"
+ #include "gameterm.h"
  
  /*!
   * @brief プレイヤーの特性フラグ一覧表示2a /

diff --cc src/view/display-player-stat-info.c
index ccf363f,55b4b96..3d99d22
--- 1/src/view/display-player-stat-info.c
--- 2/src/view/display-player-stat-info.c
+++ b/src/view/display-player-stat-info.c
@@@ -6,10 -6,8 +6,10 @@@
   * ここにこれ以上関数を引っ越してくるのは禁止。何ならここから更に分割していく
   */
  
 +#include "angband.h"
  #include "display-player-stat-info.h"
- #include "term.h"
 +#include "player/mimic-info-table.h"
+ #include "gameterm.h"
  #include "player-personality.h"
  #include "player/permanent-resistances.h"
  

diff --cc src/view/display-player.c
index 47c6f1d,73b0a48..f4c6638
--- 1/src/view/display-player.c
--- 2/src/view/display-player.c
+++ b/src/view/display-player.c
@@@ -7,9 -7,8 +7,9 @@@
   */
  
  #include "display-player.h"
 +#include "player/mimic-info-table.h"
  #include "player-personality.h"
- #include "term.h"
+ #include "gameterm.h"
  #include "status-first-page.h"
  #include "player-sex.h"
  #include "patron.h"

diff --cc src/wizard2.c
Simple merge