X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Ffleet.h;h=74e4e8653404d7e6264aee6d3e646290e8be5e38;hp=dfc5fdd6657479343f5219474e7dae2b3dcb54d4;hb=d1b57a078d3edb148f8b6ec61944a0b852a4bf94;hpb=eba582b38f8b12085c166177a9d80a9f8429d1ec

diff --git a/bs/fleet.h b/bs/fleet.h
index dfc5fdd..74e4e86 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -29,6 +29,7 @@ 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;
 typedef std::map<std::string, std::vector<int> > ResourceList;
+typedef std::map<std::string, int> ArmorList;
 //! An abstraction of a fleet and the engine for the battle simulation.
 /**This class and it's derivates is  the engine for the whole battlesystem.
   *	One of the few parts that I plan make fully portable.
@@ -105,13 +106,15 @@ public:
 
 	std::vector<Fleet*> calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0);
 
-	void takeShoot(std::string unittype, int number, std::map<std::string, int>& hitunits);
-	void takeEMP(std::string unittype, int number);
 	void killFleet(std::string unittype, int number, int tick = 0);
 
 	void setResource(std::string type, int number, int tick = 0);
 	int resource(std::string type, int tick = 0)const;
 	
+	void takeShoot(std::string unittype, int number, std::map<std::string, int>& hitunits);
+	void takeEMP(std::string unittype, int number);
+
+	void printFleet();
 protected:
 
 
@@ -121,6 +124,8 @@ protected:
 	FleetList	m_Fleet;
 	FleetList	m_BlockedFleet;
 	ResourceList m_Resources;
+	ArmorList	m_Armor;
+	
 
 
 	static UnitList s_Units;