X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Ffleet.h;h=c156545971078d921634f96fddecc7c41dd87795;hp=ca2fddfdc616dde9be124c5932b1c6e77c559df2;hb=5940cfda3be2c7b4ecbd64c814948b29139177c0;hpb=7a187d329c61f264cbafc28654c6b8bb1e3b87a1

diff --git a/bs/fleet.h b/bs/fleet.h
index ca2fddf..c156545 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -25,8 +25,9 @@
 
 #include "unittype.h"
  template<typename T> class MyComp { public: bool operator()(T,T) { return false; } };
-
+typedef std::map<std::string, std::vector<int> > FleetList;
 typedef std::map<std::string, UnitType>	UnitList;
+typedef std::map<std::string, std::vector<int> > RaceList;
 //!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.
@@ -37,7 +38,7 @@ class Fleet
 {
 public: 
 	Fleet();
-	~Fleet();
+	virtual ~Fleet();
 
 	/**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,
@@ -48,7 +49,7 @@ public:
 	/**Returns the name of this fleet.
 	 * \see setName
 	 */
-	std::string Name() const;
+	std::string name() const;
 
 	/**The race string decides what type of ships this fleet can have.
 	 * The values must be feeded into this class.
@@ -61,13 +62,13 @@ public:
 	 * \return The race, represented as a string.
 	 * \see setRace
 	 */
-	std::string Race() const;
+	std::string race() const;
 
 	std::vector<int> RacesAllowed() const;
 
 	/**Returns the total number of ships in this fleet
 	 */
-	int NumberOfShips() const;
+	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
@@ -78,20 +79,28 @@ public:
 	 */
 	int  ETA() const;
 
-	static void setRaces(std::map<std::string, std::vector<int> >& races);
+
+	/**Returns the score. This value is the total resources spent on this fleet
+	 * devided with 10.
+	 * \param tick tells the function what tick you want the score from. 0 is 
+	 * initial score before the fleet has landed.
+	 */
+	virtual unsigned score(int tick = 0) const;
+
+	static void setRaces(RaceList& races);
 	static void setUnits(UnitList& units);
 
-	static const std::map<std::string, std::vector<int> >& Races();
+	static const RaceList& 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;
+	FleetList	m_Fleet;
 
 	static UnitList s_Units;
-	static std::map<std::string, std::vector<int> > s_Races;
+	static RaceList s_Races;
 };
 
 #endif