last minute bug.. ;P

[hbs.git] / bs / planet.cpp

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 0da7d97a30ddc30b733ec8069470021f1472c0c1..c374a99ff9cc7f726fd18392cad21aeb0890a5b2 100644 (file)
--- 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);*/
@@ -171,7 +172,7 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
                
                string unittype = i->second;
 
-               cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl;
+               //cerr << "Initiative: " << s_Units[unittype].initiative() << " with unit: " << unittype << endl;
 
                if (s_Units[unittype].type() == "EMP")  
                {
@@ -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";
                                        }
                                }
                        }