X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=047fc131844588dc03c3f2b97ec56073f1abb5e7;hb=15d92b3097a80faf26b8ce4cb4a6b957d17bc092;hp=88c78842b92c90452a026d556d25c4f96a56b4c9;hpb=4449ffee20fa04e3b865cbd37ba8027bae599018;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index 88c7884..047fc13 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -45,7 +45,7 @@ public:
 	/**Returns the name of this fleet.
 	 * \see setName
 	 */
-	std::string Name();
+	std::string Name() const;
 
 	/**The race string decides what type of ships this fleet can have.
 	 * The values must be feeded into this class.
@@ -58,12 +58,33 @@ public:
 	 * \return The race, represented as a string.
 	 * \see setRace
 	 */
-	std::string Race();
+	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(std::map<std::string, UnitType>& units);
+
+	static const std::map<std::string, std::vector<int> >& Races();
+	static const std::map<std::string, UnitType>& 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>	s_Units;