Merge pull request #936 from shimitei/feature/#916_fix_sound_on_off

[Fix] Win版のタイル/壁紙/効果音切り替えバグを修正

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

diff --cc Hengband/Hengband/Hengband.vcxproj.filters
index 73c5590,03bfd03..5bd5b8f
--- 1/Hengband/Hengband/Hengband.vcxproj.filters
--- 2/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@@ -2253,12 -2253,9 +2253,12 @@@
      <ClCompile Include="..\..\src\main\scene-table-monster.cpp">\r
        <Filter>main</Filter>\r
      </ClCompile>\r
-     <ClCompile Include="..\..\src\main-win\read-graphics.cpp">\r
+     <ClCompile Include="..\..\src\main-win\graphics-win.cpp">\r
        <Filter>main-win</Filter>\r
      </ClCompile>\r
 +    <ClCompile Include="..\..\src\system\player-type-definition.cpp">\r
 +      <Filter>system</Filter>\r
 +    </ClCompile>\r
    </ItemGroup>\r
    <ItemGroup>\r
      <ClInclude Include="..\..\src\combat\shoot.h">\r
@@@ -4854,18 -4851,12 +4854,15 @@@
      <ClInclude Include="..\..\src\store\store-key-processor.h">\r
        <Filter>store</Filter>\r
      </ClInclude>\r
-     <ClInclude Include="..\..\src\main-win\read-graphics.h">\r
-       <Filter>main-win</Filter>\r
-     </ClInclude>\r
-     <ClInclude Include="..\..\src\main-win\tile-info.h">\r
+     <ClInclude Include="..\..\src\main-win\string-win.h">\r
        <Filter>main-win</Filter>\r
      </ClInclude>\r
-     <ClInclude Include="..\..\src\main-win\string-win.h">\r
+     <ClInclude Include="..\..\src\main-win\graphics-win.h">\r
        <Filter>main-win</Filter>\r
      </ClInclude>\r
 +    <ClInclude Include="..\..\src\system\player-type-definition.h">\r
 +      <Filter>system</Filter>\r
 +    </ClInclude>\r
    </ItemGroup>\r
    <ItemGroup>\r
      <None Include="..\..\src\wall.bmp" />\r

diff --cc src/Makefile.am
Simple merge

diff --cc src/main-win.cpp
Simple merge