cambios drasticos producen cuelgues obvios, etapa de revision, pueden mirarlo libremente

[z.facultad/75.42/plaqui.git] / Constructor / and.cpp

diff --git a/Constructor/and.cpp b/Constructor/and.cpp
index debe5f5bac5a7c7c6b64caf78716f53a7984906f..768390a5792a38048e5d79e731a2e1d2a0b27e00 100644 (file)
--- a/Constructor/and.cpp
+++ b/Constructor/and.cpp
@@ -66,30 +66,29 @@ 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;
+       return false;*/
+       return true;
 }
 
+/*
 bool And::is_connection_area(int _a, int _b)
 {
        switch (imgActual) {
@@ -108,3 +107,4 @@ bool And::is_connection_area(int _a, int _b)
        }
        return false;
 }
+*/