X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=ca2fddfdc616dde9be124c5932b1c6e77c559df2;hb=8de428972f669c93467e442295ba472e82eaaa2f;hp=95c0c88dffbe53a779afd3557951cc24df045b3e;hpb=56b09bf912d2965744e2e78a30fc68d73ebe401c;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index 95c0c88..ca2fddf 100644
--- 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.
@@ -60,6 +63,8 @@ public:
 	 */
 	std::string Race() const;
 
+	std::vector<int> RacesAllowed() const;
+
 	/**Returns the total number of ships in this fleet
 	 */
 	int NumberOfShips() const;
@@ -74,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;
@@ -85,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;
 };