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

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 71d8cce..02bbbcb 100644
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -118,14 +118,26 @@ bool Cistern::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) &&
-				 is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) 
+			if ( is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16) &&
+				 is_other_connection_area( get_position_x() + 16, get_position_y() - 5) ) 
 				return true;				
-			break;
 		case 1:
-			if ( is_other_occupied_area( get_position_x() -10, get_position_y()+get_image()->get_height()-10) &&
-				 is_other_occupied_area( get_position_x()+get_image()->get_width() - 10, get_position_y() - 10) )
+			if ( is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16) &&
+				 is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5) )
 				return true;
 	}
 	return false;
 }
+
+bool Cistern::is_connection_area(int _a, int _b)
+{
+	switch (imgActual) {
+		case 0: if ( ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+10)&&(_b > y) ) ||
+						 ( (_a <= x+image->get_width()-1)&&(_a >=x+image->get_width()-10)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) ) )
+						return true;
+		case 1: if ( ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+10)&&(_b > y) ) ||
+						 ( (_a <= x +10)&&(_a > x)&&(_b<=y+image->get_height()-10)&&(_b >=y+image->get_height()-22) ) )
+						return true;
+	}
+	return false;
+}