X-Git-Url: https://ruin.nu/git/graph/stats/%3CTMPL_VAR%20NAME=Coords%3E?a=blobdiff_plain;f=bs%2Fplanet.cpp;h=0e4de71300db0651919b5b36549e5537dbf61dba;hb=a61c6ecdc3dd55f06e06cc1a295b1b4fc2830314;hp=0da7d97a30ddc30b733ec8069470021f1472c0c1;hpb=515395613c36c35c3797bc085f6d54a8ac7725d9;p=hbs.git

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 0da7d97..0e4de71 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -144,6 +144,7 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 
 		allFriends.distributeLossesGains(friends, tick);
 		allHostiles.distributeLossesGains(hostiles, tick);
+		allHostiles.distributeCappedRoids(hostiles, tick);
 
 	/*	for (RoidList::iterator i = m_Roids.begin(); i != m_Roids.end(); ++i)
 			setRoids(i->first, roids(i->first, 1), tick);*/
@@ -221,10 +222,10 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
 		
 						//FIXME: Going to move this to the distribute roids section instead..
 						hostiletemp->killFleet(unittype, caproids, 1);
-						int totroids = caproids + hostiletemp->resource(roid->first, 0);
-						hostiletemp->setResource(roid->first, totroids, 1);
+						//int totroids = caproids + hostiletemp->resource(roid->first, 0);
+						hostiletemp->addResource(roid->first, caproids, 1);
 						
-						cerr << totroids << " stolen " << roid->first << " roids\n";
+						cerr << caproids << " stolen " << roid->first << " roids\n";
 					}
 				}
 			}