* Se agrega un Tanque al ejemplo, y ANDA!!!!

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

diff --git a/Constructor/splitter.cpp b/Constructor/splitter.cpp
index 3e17b496007fdad123f6be4913a093bfc8517137..c7ca0e6feeda1f8aaebce49ce4780dd6f4647807 100644 (file)
--- a/Constructor/splitter.cpp
+++ b/Constructor/splitter.cpp
@@ -96,24 +96,43 @@ bool Splitter::check_connection()
 {
        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()-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_occupied_area( get_position_x()+get_image()->get_width() - 10, get_position_y() -10) && 
-                                        is_other_occupied_area( get_position_x()-10, get_position_y()+get_image()->get_height()-10) )
+                               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_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()+get_image()->get_width()+5, get_position_y()+get_image()->get_height()-16) )
                                        return true;
                                break;
                        case 3:
-                               if ( is_other_occupied_area( get_position_x()+get_image()->get_width()+10, get_position_y() +10) &&
-                                        is_other_occupied_area( get_position_x() + 10, get_position_y()+get_image()->get_height() + 10) )
+                               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;
 }
+
+bool Splitter::is_connection_area(int _a, int _b)
+{
+       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;
+               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;
+               case 2: 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 3: if ( ( (_a <= x+image->get_width()-1)&&(_a >= x+image->get_width()-10) && (_b <=y+22)&&(_b>=y+10) ) ||
+                                                ( (_a <= x+22)&&(_a>=x+10)&&(_b<=y+image->get_height()-1)&&(_b>=y+image->get_height()-10) ) )
+                                               return true;
+       }
+       return false;
+}