X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/551d0c744aaa1e33f000efb66b6f3f042966d21f..7f099f6374e9606735fb9766b51b5e86d83de815:/Constructor/cistern.cpp?ds=sidebyside diff --git a/Constructor/cistern.cpp b/Constructor/cistern.cpp index fe0e5dd..71d8cce 100644 --- a/Constructor/cistern.cpp +++ b/Constructor/cistern.cpp @@ -14,6 +14,7 @@ Cistern::Cistern() ref->get_widget_derived("cistern_pty_wnd",cistern_pty_wnd); cistern_pty_wnd->cistern = this; cistern_pty_wnd->set_title("Propiedades del Tanque"); + name = "tanque"; } Cistern::~Cistern() @@ -117,11 +118,13 @@ bool Cistern::check_connection() { 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) ) + 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) ) return true; break; case 1: - if ( is_other_occupied_area( get_position_x() -10, get_position_y()+get_image()->get_height()-10) ) + 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) ) return true; } return false;