The work on the combat algorithm is going forward, nothing worth compiling yet though.

[hbs.git] / bs / fleet.cpp

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index cb15df528c6bce726a0f7dd52db026f7d57f5a31..97be5aaf867286b7e24d8d178dac634eb9667396 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -29,6 +29,7 @@ Fleet::Fleet()
        m_iETA = 0;
        m_sRace = "Cathaar";
 }
+
 Fleet::~Fleet(){
 }
 
@@ -81,7 +82,8 @@ int Fleet::numberOfShips() const
 
        for (map<string, vector<int> >::const_iterator i = m_Fleet.begin(); i != m_Fleet.end(); ++i)
        {
-               total += i->second[0];
+               if (i->second.size() != 0)
+                       total += i->second[0];
        }
 
        return total;
@@ -168,9 +170,55 @@ 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;
 }
 
+//////////////////////////////////////////////////////////////////////////
+//
+void Fleet::setFleet(string unittype, int number)
+{
+       if (m_Fleet[unittype].size() == 0)
+       {
+               m_Fleet[unittype].push_back(number);
+               return;
+       }
+       m_Fleet[unittype][0] = number;
+}
+
+//////////////////////////////////////////////////////////////////////////
+//
+int     Fleet::fleet(string unittype, int tick = 0)
+{
+       if (m_Fleet[unittype].size() == 0)
+               return 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 distributeLossesGains(std::vector<Fleet*> fleets, int tick = 0)
+{
+}
+