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 / cistern.cpp

diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp
index 71d8cceb92fac1d70a6d1641fadb31019e0b4f19..02bbbcb36339c294e6e11330f0f5ced3f7a08581 100644 (file)
--- a/Constructor/cistern.cpp
+++ b/Constructor/cistern.cpp
@@ -118,14 +118,26 @@ bool Cistern::check_connection()
 {
        switch (get_img_actual()) {
                case 0:
 {
        switch (get_img_actual()) {
                case 0:

-                       if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10 , get_position_y()+get_image()->get_height() -10) &&
-                                is_other_occupied_area( get_position_x() + 10, get_position_y() - 10) ) 
+                       if ( is_other_connection_area( get_position_x()+get_image()->get_width() + 5 , get_position_y()+get_image()->get_height() -16) &&
+                                is_other_connection_area( get_position_x() + 16, get_position_y() - 5) ) 

                                return true;                            
                                return true;                            

-                       break;

                case 1:
                case 1:

-                       if ( is_other_occupied_area( get_position_x() -10, get_position_y()+get_image()->get_height()-10) &&
-                                is_other_occupied_area( get_position_x()+get_image()->get_width() - 10, get_position_y() - 10) )
+                       if ( is_other_connection_area( get_position_x() -5, get_position_y()+get_image()->get_height()-16) &&
+                                is_other_connection_area( get_position_x()+get_image()->get_width() - 16, get_position_y() - 5) )

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

+
+bool Cistern::is_connection_area(int _a, int _b)
+{
+       switch (imgActual) {
+               case 0: 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 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;
+       }
+       return false;
+}