X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=ca2fddfdc616dde9be124c5932b1c6e77c559df2;hb=665ed3eda32aa26a4063dc4eaae694ddc2f12f50;hp=3bdd4ce5719042c6e7d6818d0d41ccf151d0dc21;hpb=74e88b9621331f15ffc22565cb972c3e1e00425f;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index 3bdd4ce..ca2fddf 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -19,29 +19,79 @@
 #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.
   *\todo LOTS (I think ;)
   *@author Michael Andreen
   */
-
 class Fleet 
 {
 public: 
 	Fleet();
 	~Fleet();
 
-private:
-	std::string	m_Name;
-	std::string	m_Race;
+	/**Sets the name that represents this fleet. Might be different a name
+	 * like foobar or some coordinates like 1:1:1. The name doesn't have to be unique,
+	 * since it's up to the rest of the program to handle that part.
+	 * \see Name
+	 */
+	void   setName(std::string sName);
+	/**Returns the name of this fleet.
+	 * \see setName
+	 */
+	std::string Name() const;
+
+	/**The race string decides what type of ships this fleet can have.
+	 * The values must be feeded into this class.
+	 * \param sRace This is just the name of the race. It's case-sensitive.
+	 * \return If the race is available this function returns true, if not false is returned. The race is set in both cases though.
+	 * \see Race
+	 */
+	bool   setRace(std::string sRace);
+	/**Just returns what race this fleet belongs to.. 
+	 * \return The race, represented as a string.
+	 * \see setRace
+	 */
+	std::string Race() const;
+
+	std::vector<int> RacesAllowed() const;
+
+	/**Returns the total number of ships in this fleet
+	 */
+	int NumberOfShips() const;
+
+	/**Sets the estimated time of arrival. The time as a single integer,
+	 * in relation to the current time. For example if the current time is
+	 * 10, and the arrival is at 12, then the eta is 2.
+	 */
+	void setETA(int eta);
+	/**Return the estimated time of arrival. It's counted from the current time (tick).
+	 */
+	int  ETA() const;
+
+	static void setRaces(std::map<std::string, std::vector<int> >& races);
+	static void setUnits(UnitList& units);
+
+	static const std::map<std::string, std::vector<int> >& Races();
+	static const UnitList& Units();
+
+protected:
+	std::string	m_sName;
+	std::string	m_sRace;
+	int         m_iETA;
 	std::map<std::string, std::vector<int> >	m_Fleet;
 
-	static std::map<std::string, UnitType>	m_Units;
+	static UnitList s_Units;
+	static std::map<std::string, std::vector<int> > s_Races;
 };
 
 #endif