some modifications

[hbs.git] / bs / fleet.h

diff --git a/bs/fleet.h b/bs/fleet.h
index 047fc131844588dc03c3f2b97ec56073f1abb5e7..ca2fddfdc616dde9be124c5932b1c6e77c559df2 100644 (file)
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -19,11 +19,14 @@
 #define FLEET_H
 
 #include <map>
+#include <ext/hash_map>
 #include <string>
 #include <vector>
 
 #include "unittype.h"
+ template<typename T> class MyComp { public: bool operator()(T,T) { return false; } };
 
+typedef std::map<std::string, UnitType>        UnitList;
 //!This is the engine for the whole battlesystem.
 /**This is the engine for the whole battlesystem.
   *    One of the few parts that I plan make fully portable.
@@ -76,10 +79,10 @@ public:
        int  ETA() const;
 
        static void setRaces(std::map<std::string, std::vector<int> >& races);
-       static void setUnits(std::map<std::string, UnitType>& units);
+       static void setUnits(UnitList& units);
 
        static const std::map<std::string, std::vector<int> >& Races();
-       static const std::map<std::string, UnitType>& Units();
+       static const UnitList& Units();
 
 protected:
        std::string     m_sName;
@@ -87,7 +90,7 @@ protected:
        int         m_iETA;
        std::map<std::string, std::vector<int> >        m_Fleet;
 
-       static std::map<std::string, UnitType>  s_Units;
+       static UnitList s_Units;
        static std::map<std::string, std::vector<int> > s_Races;
 };