X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=bs%2Ffleet.h;h=2ae03e7c01683a34d1321a99db3073bed3f905fd;hb=9fa0d25038087d8417c0849a495eeae1abcb9504;hp=673eb42037aa9ef965782ff4e1f81f194aedc0c9;hpb=5b3a1459c35efe60c4255a5c50a1d74fdbe8e8eb;p=hbs.git

diff --git a/bs/fleet.h b/bs/fleet.h
index 673eb42..2ae03e7 100644
--- a/bs/fleet.h
+++ b/bs/fleet.h
@@ -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);
 
@@ -282,6 +282,8 @@ public:
 
 	void usePodGuns(int tick = 0, int guns = 1);
 
+	std::map<std::string, int*> findTargets(std::string targetClass,int& total, int attackerType = 0);
+
 	//static functions
 	//
 	/** This function is used to set the different races used.