X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d53ded00c10a30a17c7f0aad90acca933a7f4db9..f5a1e732bf3907cabd004932aba3256b31d9d282:/Constructor/and.cpp?ds=sidebyside

diff --git a/Constructor/and.cpp b/Constructor/and.cpp
index debe5f5..01f8ac0 100644
--- a/Constructor/and.cpp
+++ b/Constructor/and.cpp
@@ -66,45 +66,24 @@ void And::save(FILE *archivo)
 // CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 bool And::check_connection()
 {
-	switch (get_img_actual()) {
+	/*switch (get_img_actual()) {
 			case 0:
 				if ( is_other_connection_area( get_position_x()-5, get_position_y()+16) && 
 					 is_other_connection_area( get_position_x()+get_image()->get_width()-16, +get_position_y()+get_image()->get_height() + 5) )
 					return true;				
-				break;	
 			case 1:
 				if ( is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() -5) && 
 					 is_other_connection_area( get_position_x()-5, get_position_y()+get_image()->get_height()-16) )
 					return true;
-				break;
 			case 2:
 				if ( is_other_connection_area( get_position_x() + 16, get_position_y() -5) &&
 					 is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) )
 					return true;
-				break;
 			case 3:
 				if ( is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y() +16) &&
 					 is_other_connection_area( get_position_x() + 16, get_position_y()+get_image()->get_height() + 5) )
 					return true;
 	}
-	return false;
-}
-
-bool And::is_connection_area(int _a, int _b)
-{
-	switch (imgActual) {
-		case 0: if ( ( (_a <= x+10)&&(_a > x) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_a <= x+image->get_width()-10)&&(_a>=x+image->get_width()-22)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
-						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;
-		case 2: 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 3: if ( ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) ||
-						 ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
-						return true;
-	}
-	return false;
+	return false;*/
+	return true;
 }