Fix Nike Cross counting stuns as kills

Author: Shoes01

src/Battlescape/DebriefingState.cpp

@@ -256,7 +256,7 @@ DebriefingState::DebriefingState() : _region(0), _country(0), _noContainment(fal
 			int soldierAlienKills = 0;
 			for (std::vector<BattleUnitKills*>::const_iterator k = (*j)->getStatistics()->kills.begin(); k != (*j)->getStatistics()->kills.end(); ++k)
 			{
-				if ((*k)->faction == FACTION_HOSTILE)
+				if ((*k)->faction == FACTION_HOSTILE && (*k)->getUnitStatusString() == "STATUS_DEAD")
 				{
 					soldierAlienKills++;
 				}

src/OpenXcom.2010.vcxproj

@@ -758,16 +758,10 @@
     <ClInclude Include="Ruleset\MapBlock.h" />
     <ClInclude Include="Ruleset\MapDataSet.h" />
     <ClInclude Include="Ruleset\MapData.h" />
-    <ClInclude Include="Ruleset\AlienDeployment.h" />
-<<<<<<< HEAD
-    <ClInclude Include="Ruleset\AlienRace.h" />
+    <ClInclude Include="Ruleset\AlienDeployment.h" />
     <ClInclude Include="Ruleset\RuleCommendations.h" />
-    <ClInclude Include="Ruleset\StatString.h" />
-    <ClInclude Include="Ruleset\StatStringCondition.h" />
-=======
     <ClInclude Include="Ruleset\AlienRace.h" />
-    <ClInclude Include="Ruleset\MapScript.h" />
->>>>>>> master
+    <ClInclude Include="Ruleset\MapScript.h" />
     <ClInclude Include="Ruleset\MCDPatch.h" />
     <ClInclude Include="Ruleset\Polygon.h" />
     <ClInclude Include="Ruleset\Polyline.h" />