X-Git-Url: https://ruin.nu/git/?p=hbs.git;a=blobdiff_plain;f=bs%2Ffleet.cpp;h=a15fba36788628798d041ce50c4745585d590737;hp=1cdc04fb9d1a3e49e022d2a8ca4fc68175f81090;hb=1b65d9ef6b9a5d8eb6aa241ed9693b7e6e74f910;hpb=acd5e6eb664984cd6dfdbf75e29c7102ceeeddc2

diff --git a/bs/fleet.cpp b/bs/fleet.cpp
index 1cdc04f..a15fba3 100644
--- a/bs/fleet.cpp
+++ b/bs/fleet.cpp
@@ -374,7 +374,8 @@ void Fleet::takeShoot(std::string unittype, int number, std::map<std::string, in
 				if (m_Fleet[j->first].size() == 0)
 					continue;
 
-				if (m_Fleet[j->first].size() == 1)
+
+				if (m_Fleet[j->first].size() == 1 )
 					m_Fleet[j->first].push_back(m_Fleet[j->first][0]);
 
 				//cerr << "Target is class: " << j->second.type() << endl;
@@ -478,6 +479,9 @@ void Fleet::takeEMP(std::string unittype, int number)
 				if (j->second.type() == "PDS")
 					continue;
 
+				if (freeFleet(j->first, 1) <= 0)
+					continue;
+
 				if (m_Fleet[j->first].size() == 0)
 					continue;
 
@@ -514,7 +518,7 @@ void Fleet::takeEMP(std::string unittype, int number)
 				while (k > 0)	
 				{
 
-					if (*(j->second) <= 0)
+					if (*(j->second) <= blockedFleet(j->first, 1))
 						break;
 
 					int eres = s_Units[j->first].EMP();