El cliente ya se conecta, muestra en un campo de texto el log de lo que se esta

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

diff --git a/Constructor/conduct.cpp b/Constructor/conduct.cpp
index 8c540e82472778036102894c01401204a5d63b92..1a75aef33bfeab6c0d0a8f72b19201e2b68ad131 100644 (file)
--- a/Constructor/conduct.cpp
+++ b/Constructor/conduct.cpp
@@ -91,13 +91,28 @@ bool Conduct::check_connection()
 {
        switch (get_img_actual()) {
                        case 0:
 {
        switch (get_img_actual()) {
                        case 0:

-                               if ( is_other_occupied_area( get_position_x()+10, get_position_y()-10) && 
-                                        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()+16, get_position_y()-5) && 
+                                        is_other_connection_area( get_position_x()+16, get_position_y()+get_image()->get_height() +5) )

                                        return true;                            
                                break;
                        case 1:
                                        return true;                            
                                break;
                        case 1:

-                               if ( is_other_occupied_area( get_position_x()-10, get_position_y()+10) && 
-                                        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()-5, get_position_y()+16) && 
+                                        is_other_connection_area( get_position_x()+get_image()->get_width()+5, get_position_y()+16) )
+                               return true;
+       }
+       return false;
+}
+
+bool Conduct::is_connection_area(int _a, int _b)
+{
+       switch (imgActual){
+               case 0:
+                       if ( ((_a <= x+image->get_width()-10 )&&(_a >= x + 10) && (_b <= y+10) &&(_b > 0 )) ||
+                                ((_a <= x+22 )&&(_a >= x + 10) && (_b <= y+image->get_height()-1) &&(_b >= y+image->get_height()-10 )) )
+                               return true;
+               case 1:
+                       if ( ((_a <= x+10 )&&(_a > 0) && (_b <= y+image->get_height()-10) &&(_b >= y+10 )) ||
+                                ((_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <= y+image->get_height()-10) &&(_b >= y +10 )) )

                                return true;
        }
        return false;
                                return true;
        }
        return false;