solved an evil bug in Fleet::distributeLossesGains and some other stuff

[hbs.git] / bs / fleet.h

diff --git a/bs/fleet.h b/bs/fleet.h
index f1d96affc4fb1264464f704c55db3262eb5b4646..74e4e8653404d7e6264aee6d3e646290e8be5e38 100644 (file)
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -28,6 +28,8 @@
 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.
@@ -87,8 +89,10 @@ public:
         */
        unsigned score(int tick = 0) const;
 
-       void setFleet(std::string unittype, int number);
+       void setFleet(std::string unittype, int number, int tick = 0);
        int      fleet(std::string unittype, int tick = 0);
+
+       int freeFleet(std:: string unittype, int tick = 0);
        
        static void setRaces(RaceList& races);
        static void setUnits(UnitList& units);
@@ -102,7 +106,15 @@ public:
 
        std::vector<Fleet*> calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0);
 
+       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:
 
 
@@ -110,6 +122,11 @@ protected:
        std::string     m_sRace;
        int         m_iETA;
        FleetList       m_Fleet;
+       FleetList       m_BlockedFleet;
+       ResourceList m_Resources;
+       ArmorList       m_Armor;
+       
+
 
        static UnitList s_Units;
        static RaceList s_Races;