X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/d53ded00c10a30a17c7f0aad90acca933a7f4db9..31b3e321726d5c3fe720dd216687d3138523714f:/Constructor/or.cpp?ds=sidebyside diff --git a/Constructor/or.cpp b/Constructor/or.cpp index d68dc6d..c162ecb 100644 --- a/Constructor/or.cpp +++ b/Constructor/or.cpp @@ -66,7 +66,7 @@ void Or::save(FILE *archivo) // CAMBIAR TODO ESTO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! bool Or::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) ) @@ -87,12 +87,14 @@ bool Or::check_connection() 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 Or::is_connection_area(int _a, int _b) { - switch (imgActual) { + /*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; @@ -108,3 +110,4 @@ bool Or::is_connection_area(int _a, int _b) } return false; } +*/