X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/7f099f6374e9606735fb9766b51b5e86d83de815..a9318661e45dfb9853c6aba811670571a5ec3ea2:/Constructor/pump.cpp

diff --git a/Constructor/pump.cpp b/Constructor/pump.cpp
index 51993a2..719a1f9 100644
--- a/Constructor/pump.cpp
+++ b/Constructor/pump.cpp
@@ -97,7 +97,7 @@ void Pump::save(FILE *archivo)
 	dato += c_img;
 	dato += c_x; 
 	dato += c_y;
-	dato += "\t</entrega>\n";
+	dato += "\t</bomba>\n";
 	fprintf(archivo,dato.c_str());	
 }
 
@@ -105,12 +105,23 @@ bool Pump::check_connection()
 {
 	switch (get_img_actual()) {
 		case 0:
-			if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y()+get_image()->get_height() +10) )
+			if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5 , get_position_y() +16) )
 				return true;				
 			break;
 		case 1:
-			if ( is_other_occupied_area( get_position_x() -10, get_position_y() -10) )
+			if ( is_other_connection_area( get_position_x() -5, get_position_y() +16) )
 				return true;
 	}
 	return false;
 }
+
+bool Pump::is_connection_area(int _a, int _b)
+{
+	switch (imgActual) {
+		case 0: if ( (_a <= x+image->get_width()-1)&&(_a>=x+image->get_width()-10)&&(_b<=y+22)&&(_b > y) ) 
+						return true;
+		case 1: if ( (_a <= x+10)&&(_a > x)&&(_b<=y+22)&&(_b > y) ) 
+						return true;
+	}
+	return false;
+}