the battlereport works now..

[hbs.git] / bs / planet.cpp

diff --git a/bs/planet.cpp b/bs/planet.cpp
index e5aba8575eaed8c659ecc58a4818ec31d2debc2c..94fa4325c2bcea641bbe984942caba991ca13e77 100644 (file)
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -159,8 +159,8 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
        for(int tick = 1; skipped < 20; ++tick)
        {
                //See who's in the battle at the current tick
-               vector<Fleet*> friends = calculateSide(friendly, 6, tick);
-               vector<Fleet*> hostiles = calculateSide(hostile, 3, tick);
+               vector<Fleet*> friends = calculateSide(friendly, tick);
+               vector<Fleet*> hostiles = calculateSide(hostile, tick);
 
                // No idea to calculate anything if noone is there.. ;)
                if (hostiles.size() == 0)
@@ -327,10 +327,16 @@ void Planet::calcOneTick(Planet* friendly, Fleet* hostile, std::map<std::string,
 
                        return;
                }
-               m_Report[tick][init]["Friendly"][unittype] = friendlyhits;
-               m_Report[tick][init]["Friendly"][unittype]["000"] = freefriendly;
-               m_Report[tick][init]["Hostile"][unittype] = hostilehits;
-               m_Report[tick][init]["Hostile"][unittype]["000"] = freehostile;
+               if (freefriendly > 0)
+               {
+                       m_Report[tick][init]["Friendly"][unittype] = friendlyhits;
+                       m_Report[tick][init]["Friendly"][unittype]["000"] = freefriendly;
+               }
+               if (freehostile > 0)
+               {
+                       m_Report[tick][init]["Hostile"][unittype] = hostilehits;
+                       m_Report[tick][init]["Hostile"][unittype]["000"] = freehostile;
+               }
 
                //set the the objects so they point at the modified objects
                *friendly = *friendlytemp;