X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fplanet.cpp;fp=bs%2Fplanet.cpp;h=f1290ff76502e560ffbcd037037d4f2480e14251;hp=d62bf579996a1f0d583a66302fce706531c9ac59;hb=924d4cd0f8c9c340c8ba6f2e5759fed8f0c83573;hpb=6ab17155b82923f4263f1c536133e657970239a4

diff --git a/bs/planet.cpp b/bs/planet.cpp
index d62bf57..f1290ff 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -197,9 +197,11 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 		//allFriends.printFleet();
 
 		allFriends.distributeLossesGains(friends, tick);
+		allFriends.distributeStolenShips(stealfriendly, friends, tick);
 
 		allHostiles.distributeLossesGains(hostiles, tick);
 		allHostiles.distributeCappedRoids(hostiles, tick);
+		allHostiles.distributeStolenShips(stealhostile, hostiles, tick);
 
 		calculateScoreLoss(friends, tick);
 
@@ -207,6 +209,9 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 			setRoids(i->first, roids(i->first, 1), tick);*/
 	}
 
+	for (vector<Fleet*>::iterator i = friendly.begin(); i != friendly.end(); ++i)
+		(*i)->calculateSalvage();
+
 	for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
 	{
 		for (vector<int>::iterator j = i->second.begin(); j != i->second.end(); ++j)
@@ -346,6 +351,8 @@ void Planet::setCapping(float capping, int tick = 0)
 
 	if (capping <= 0.15 && capping >= 0)
 		m_Capping[tick] = capping;
-	else
+	else if (capping >= 0.15)
 		m_Capping[tick] = 0.15;
+	else
+		m_Capping[tick] = 0;
 }