Merge branch 'For2.2.2-Refactoring' into For3.0.0-Monster-Adjustment

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

diff --cc Hengband/Hengband/Hengband.vcxproj.filters
index 9243f02,a0c521d..71c158d
--- 1/Hengband/Hengband/Hengband.vcxproj.filters
--- 2/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@@ -2180,9 -2177,9 +2177,12 @@@
      <ClCompile Include="..\..\src\player\player-status-resist.c">
        <Filter>player</Filter>
      </ClCompile>
 +    <ClCompile Include="..\..\src\monster-attack\monster-attack-lose.c">
 +      <Filter>monster-attack</Filter>
 +    </ClCompile>
+     <ClCompile Include="..\..\src\io\record-play-movie.c">
+       <Filter>io</Filter>
+     </ClCompile>
    </ItemGroup>
    <ItemGroup>
      <ClInclude Include="..\..\src\combat\shoot.h">
@@@ -4720,9 -4714,9 +4717,12 @@@
      <ClInclude Include="..\..\src\player\player-status-resist.h">
        <Filter>player</Filter>
      </ClInclude>
 +    <ClInclude Include="..\..\src\monster-attack\monster-attack-lose.h">
 +      <Filter>monster-attack</Filter>
 +    </ClInclude>
+     <ClInclude Include="..\..\src\io\record-play-movie.h">
+       <Filter>io</Filter>
+     </ClInclude>
    </ItemGroup>
    <ItemGroup>
      <None Include="..\..\src\wall.bmp" />

diff --cc src/Makefile.am
Simple merge