From 42d18c6a376ce7eccb2f061f6a0ba6add78a1e0c Mon Sep 17 00:00:00 2001
From: thebracket <herberticus@gmail.com>
Date: Thu, 22 Sep 2016 11:05:50 -0500
Subject: [PATCH] VS Tweaks pre-release.

---
 BlackFuture/BlackFuture.vcxproj         | 2 ++
 BlackFuture/BlackFuture.vcxproj.filters | 6 ++++++
 src/planet/builder/region_builder.cpp   | 1 +
 src/systems/settler_ai_system.cpp       | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/BlackFuture/BlackFuture.vcxproj b/BlackFuture/BlackFuture.vcxproj
index fe957c3a..e8f920d5 100644
--- a/BlackFuture/BlackFuture.vcxproj
+++ b/BlackFuture/BlackFuture.vcxproj
@@ -221,6 +221,7 @@
     <ClInclude Include="..\src\systems\lighting_system.hpp" />
     <ClInclude Include="..\src\systems\map_render_system.hpp" />
     <ClInclude Include="..\src\systems\mining_system.hpp" />
+    <ClInclude Include="..\src\systems\mode_civs_system.hpp" />
     <ClInclude Include="..\src\systems\mode_rogue_render_system.hpp" />
     <ClInclude Include="..\src\systems\mode_rogue_system.hpp" />
     <ClInclude Include="..\src\systems\mode_units_system.hpp" />
@@ -296,6 +297,7 @@
     <ClCompile Include="..\src\systems\lighting_system.cpp" />
     <ClCompile Include="..\src\systems\map_render_system.cpp" />
     <ClCompile Include="..\src\systems\mining_system.cpp" />
+    <ClCompile Include="..\src\systems\mode_civs_system.cpp" />
     <ClCompile Include="..\src\systems\mode_rogue_render_system.cpp" />
     <ClCompile Include="..\src\systems\mode_rogue_system.cpp" />
     <ClCompile Include="..\src\systems\mode_units_system.cpp" />
diff --git a/BlackFuture/BlackFuture.vcxproj.filters b/BlackFuture/BlackFuture.vcxproj.filters
index 83e70b99..9ec7a65f 100644
--- a/BlackFuture/BlackFuture.vcxproj.filters
+++ b/BlackFuture/BlackFuture.vcxproj.filters
@@ -444,6 +444,9 @@
     <ClInclude Include="..\src\systems\game_over_system.hpp">
       <Filter>Header Files\systems</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\systems\mode_civs_system.hpp">
+      <Filter>Header Files\systems</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\main.cpp">
@@ -692,5 +695,8 @@
     <ClCompile Include="..\src\systems\game_over_system.cpp">
       <Filter>Source Files\systems</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\systems\mode_civs_system.cpp">
+      <Filter>Source Files\systems</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/planet/builder/region_builder.cpp b/src/planet/builder/region_builder.cpp
index 1a442947..af3e5b55 100644
--- a/src/planet/builder/region_builder.cpp
+++ b/src/planet/builder/region_builder.cpp
@@ -119,6 +119,7 @@ inline std::vector<int> create_subregions(planet_t &planet, region_t &region, st
             }
         }
     }
+	return subregion_idx;
 }
 
 inline void zero_map(region_t &region) {
diff --git a/src/systems/settler_ai_system.cpp b/src/systems/settler_ai_system.cpp
index fb5532c6..1404bbfa 100644
--- a/src/systems/settler_ai_system.cpp
+++ b/src/systems/settler_ai_system.cpp
@@ -1245,7 +1245,7 @@ void settler_ai_system::do_equip_armor(entity_t &e, settler_ai_t &ai, game_stats
 		each<item_carried_t>([&e, &pos, &loc] (entity_t &E, item_carried_t &c) {
 			if (c.carried_by == e.id && c.location == loc) emit(drop_item_message{E.id, pos.x, pos.y, pos.z});
 		});
-		emit(pickup_item_message{ai.target_id, e.id, loc});
+		emit(pickup_item_message{static_cast<std::size_t>(ai.target_id), e.id, loc});
 		ai.current_tool = 0;