X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Fplanet.cpp;h=8fd1726b3979c4d287eb004597758315c762a28b;hp=41d92ac51eb2ed6004bab3b01c8009a46b8fdefb;hb=9f0513b48fbafa876159812f638019c6b47eae33;hpb=d1b57a078d3edb148f8b6ec61944a0b852a4bf94

diff --git a/bs/planet.cpp b/bs/planet.cpp
index 41d92ac..8fd1726 100644
--- a/bs/planet.cpp
+++ b/bs/planet.cpp
@@ -103,16 +103,18 @@ void Planet::runBattle(std::vector<Fleet*> friendly, std::vector<Fleet*> hostile
 			skipped = 0;
 
 		Planet allFriends;
-		allFriends.addToThis(friends);
+		allFriends.addToThis(friends, tick);
 		
 		Fleet allHostiles;
-		allHostiles.addToThis(hostiles);
+		allHostiles.addToThis(hostiles, tick);
 
 		map<string, map<string, int> > stealfriendly;
 		map<string, map<string, int> > stealhostile;
 		
 		calcOneTick(&allFriends, &allHostiles, stealfriendly, stealhostile );
 
+		//allFriends.printFleet();
+
 		allFriends.distributeLossesGains(friends, tick);
 		allHostiles.distributeLossesGains(hostiles, tick);
 	}
@@ -133,7 +135,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")	
 		{