]> ruin.nu Git - hbs.git/blobdiff - bs/fleet.h
the battlereport works now..
[hbs.git] / bs / fleet.h
index 673eb42037aa9ef965782ff4e1f81f194aedc0c9..6946d3c5ae9521ae8c7da30662684705ce47d33c 100644 (file)
@@ -179,7 +179,7 @@ public:
         * and are staying long enough.
         * \todo add the stays part as a integrated part of each fleet.
         */
-       std::vector<Fleet*> calculateSide(std::vector<Fleet*> fleets, int stays = 0, int tick = 0);
+       std::vector<Fleet*> calculateSide(std::vector<Fleet*> fleets, int tick = 0);
 
        /** Kill some ships of the specified type in the current fleet.
         * \param unittype the name of the unit to kill
@@ -262,7 +262,7 @@ public:
         * very similar stuff in both the take* functions.
         * \sa takeShoot
         */
-       void takeEMP(std::string unittype, int number);
+       void takeEMP(std::string unittype, int number, std::map<std::string, int>& hitunits);
 
        void calculateLostStealships(std::string unittype, std::map<std::string, int> stolen, int tick = 1);