From: Nicolás Dimov Date: Wed, 12 Nov 2003 19:05:15 +0000 (+0000) Subject: si no me equivoco ahi se verifica bien todo, habia problemas con la union pero creo... X-Git-Tag: svn_import~307 X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/d01f45589c6724a13cda1bbef1bcdacfa4a0bad9 si no me equivoco ahi se verifica bien todo, habia problemas con la union pero creo que ya esta. hay que seguir probando --- diff --git a/Constructor/union.cpp b/Constructor/union.cpp index e422133..f5b6d98 100644 --- a/Constructor/union.cpp +++ b/Constructor/union.cpp @@ -134,12 +134,12 @@ bool Union::is_connection_area(int _a, int _b) ((_a <= x +10) && (_a > x )&&(_b <= y+image->get_height()/2+5 ) && (_b >= y+image->get_height()/2-5)) || ((_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 2: if ( ((_a <= x+10) && (_a > x+1) && (_b<= y+image->get_height()-1) && (_b >= y+image->get_height()-10)) || + case 2: if ( ((_a <= x+10) && (_a > x) && (_b<= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) || ((_a <= x+image->get_width()-1) && (_a >= x+image->get_width()-10)&&(_b <= y+image->get_height()-10) && (_b >= y+image->get_height()-22)) || ((_a <= x+image->get_width()/2 + 5)&&( _a>= x+image->get_width()/2 - 5) && (_b<=y+10)&&(_b > y)) ) return true; case 3: if ( ((_a <= x+22) && (_a >= x+10) && (_b<= y + 10) && (_b > y )) || - ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()+10)) || + ((_a <= x+22) && (_a >= x+10 )&&(_b <= y+image->get_height()-1 ) && (_b >= y+image->get_height()-10)) || ((_a <= x+image->get_width() -1)&&( _a>= x+image->get_width()-10) && (_b<=y+image->get_height()/2+5)&&(_b >= y+image->get_height()/2-5)) ) return true; }