X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/551d0c744aaa1e33f000efb66b6f3f042966d21f..a9318661e45dfb9853c6aba811670571a5ec3ea2:/Constructor/cistern.cpp?ds=sidebyside

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index fe0e5dd..02bbbcb 100644
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -14,6 +14,7 @@ Cistern::Cistern()
 	ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd);
 	cistern_pty_wnd->cistern = this;
 	cistern_pty_wnd->set_title("Propiedades del Tanque");	
+	name = "tanque";
 }
 
 Cistern::~Cistern()
@@ -117,12 +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) )
+			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) )
+			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;
+}