some modifications

[hbs.git] / bs / fleet.cpp

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 117ce39cb74e61b5b7e233cdc8db991f5b85b622..f086833c0b3266e9f7fa02ff5c2353cc281f5db6 100644 (file)
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 //Static variables
 map<string, vector<int> > Fleet::s_Races;
-map<string, UnitType > Fleet::s_Units;
+UnitList Fleet::s_Units;
 
 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,7 +145,7 @@ const map<string, vector<int> >& Fleet::Races()
 
 //////////////////////////////////////////////////////////////////////////
 //
-const map<string, UnitType>& Fleet::Units()
+const UnitList& Fleet::Units()
 {
        return s_Units;
 }