X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.cpp;h=f134f7bb1fa51b7c2d2f8e29d5d5dd6a16bafc7d;hb=ac13ca5453360c59eaa0b8ad4242ea0837825bc1;hp=00fb66b7e7005e1d590644d139f6624d4804c63d;hpb=b6d8203669c6a6016458e72fd240527845449475;p=hbs.git

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 00fb66b..f134f7b 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -170,7 +170,9 @@ unsigned Fleet::score(int tick = 0) const
 
 	for (FleetList::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i)
 	{
-		tot_score += i->second[tick] * s_Units[i->first].totRes() / 10;
+		  if (i->second.size() >= tick)
+				break;
+			tot_score += i->second[tick] * s_Units[i->first].totRes() / 10;
 	}
 
 	return tot_score;
@@ -198,4 +200,31 @@ int	 Fleet::fleet(string unittype, int tick = 0)
 	return m_Fleet[unittype][tick];
 }
 
-	
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::addToThis(std::vector<Fleet*> fleets, int tick = 0)
+{
+	for (UnitList::iterator i = s_Units.begin();  i != s_Units.end(); ++i)
+	{
+		if (m_Fleet[i->first].size() == 0)
+				m_Fleet[i->first].push_back(0);
+
+		for (vector<Fleet*>::iterator j = fleets.begin(); j != fleets.end(); ++j)
+		{
+		// FIXTHIS!!	m_Fleet[i->first][0] += j->fleet(i->first, tick);
+		}
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
+{
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+std::vector<Fleet*> Fleet::calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0)
+{
+}
+