some changes

[hbs.git] / bs / fleet.cpp

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index a46a50a2ad51944c28a979e45992f99748deecfa..2bd245ba29af67dfc1abadb6a4bdd33f12e35528 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -22,12 +22,12 @@ using namespace std;
 
 //Static variables
 map<string, vector<int> > Fleet::s_Races;
-map<string, UnitType > Fleet::s_Units;
+UnitList Fleet::s_Units;
 
 Fleet::Fleet()
 {
        m_iETA = 0;
-       m_sRace = "Generic";
+       m_sRace = "Cathaar";
 }
 Fleet::~Fleet(){
 }
@@ -110,11 +110,11 @@ void Fleet::setRaces(map<string, vector<int> >& races)
 
 //////////////////////////////////////////////////////////////////////////
 //
-void Fleet::setUnits(map<string, UnitType>& units)
+void Fleet::setUnits(UnitList& units)
 {
        s_Units = units;
 
-       for (map<string, UnitType >::iterator i = s_Units.begin(); i != s_Units.end(); i++)
+       for (UnitList::iterator i = s_Units.begin(); i != s_Units.end(); i++)
        {
                cerr << s_Units[(*i).first].Name() << "\t\t"
                        << s_Units[(*i).first].Race() <<"\t"
@@ -145,10 +145,15 @@ const map<string, vector<int> >& Fleet::Races()
 
 //////////////////////////////////////////////////////////////////////////
 //
-const map<string, UnitType>& Fleet::Units()
+const UnitList& Fleet::Units()
 {
        return s_Units;
 }
 
-
+//////////////////////////////////////////////////////////////////////////
+//
+vector<int> Fleet::RacesAllowed() const
+{
+       return s_Races[m_sRace];
+}