From d46d713fb9d5fb17f7bb67819bb23515a989244e Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@gmail.com>
Date: Sun, 18 Dec 2016 13:19:02 -0500
Subject: [PATCH] Update MSVC project and fix warnings

---
 projectfiles/VC12/wesnoth.vcxproj         | 8 ++++++++
 projectfiles/VC12/wesnoth.vcxproj.filters | 6 ++++++
 src/gui/dialogs/attack_predictions.hpp    | 4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
index 662fc42495b..46f2c8a8981 100644
--- a/projectfiles/VC12/wesnoth.vcxproj
+++ b/projectfiles/VC12/wesnoth.vcxproj
@@ -1700,6 +1700,13 @@
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\attack_predictions.cpp">
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='ReleaseDEBUG|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Test_Release|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
+    </ClCompile>
     <ClCompile Include="..\..\src\gui\dialogs\campaign_difficulty.cpp">
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug_with_VLD|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
       <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)Gui\Dialogs\</ObjectFileName>
@@ -4115,6 +4122,7 @@
     <ClInclude Include="..\..\src\gui\dialogs\addon\manager.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\addon\uninstall_list.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\advanced_graphics_options.hpp" />
+    <ClInclude Include="..\..\src\gui\dialogs\attack_predictions.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\campaign_difficulty.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\campaign_selection.hpp" />
     <ClInclude Include="..\..\src\gui\dialogs\campaign_settings.hpp" />
diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
index fe5868602cb..b16f7011f80 100644
--- a/projectfiles/VC12/wesnoth.vcxproj.filters
+++ b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -1519,6 +1519,9 @@
     <ClCompile Include="..\..\src\font\text_surface.cpp">
       <Filter>Font</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\gui\dialogs\attack_predictions.cpp">
+      <Filter>Gui\Dialogs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\addon\client.hpp">
@@ -2946,6 +2949,9 @@
     <ClInclude Include="..\..\src\font\pango\stream_ops.hpp">
       <Filter>Font\Pango</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\gui\dialogs\attack_predictions.hpp">
+      <Filter>Gui\Dialogs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\src\tests\test_sdl_utils.hpp">
diff --git a/src/gui/dialogs/attack_predictions.hpp b/src/gui/dialogs/attack_predictions.hpp
index 9e93bbc053a..4fe55948073 100644
--- a/src/gui/dialogs/attack_predictions.hpp
+++ b/src/gui/dialogs/attack_predictions.hpp
@@ -20,9 +20,9 @@
 #include "units/map.hpp"
 
 class  battle_context;
-class  battle_context_unit_stats;
+struct battle_context_unit_stats;
 class  CVideo;
-class  map_location;
+struct map_location;
 struct combatant;
 
 namespace gui2