X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/67143e098c00b0ee414bde39a78441d8e11fed8b..0aacdcf95cf6d4f33a2201160d472ab84148d52b:/Constructor/item.cpp?ds=inline

diff --git a/Constructor/item.cpp b/Constructor/item.cpp
index b526867..b4a42fe 100644
--- a/Constructor/item.cpp
+++ b/Constructor/item.cpp
@@ -54,10 +54,10 @@ void CItem::on_menu_popup_conectar()
 {
 }
 
-void CItem::set_position(int x, int y)
+void CItem::set_position(int _x, int _y)
 {
-	this->x = x;
-	this->y = y;
+	this->x = _x;
+	this->y = _y;
 }
 
 int CItem::get_position_x()
@@ -70,16 +70,16 @@ int CItem::get_position_y()
 	return y;
 }
 
-bool CItem::is_occupied_area(int a, int b)
+bool CItem::is_occupied_area(int _a, int _b)
 {	
-	if ( (a >= x ) && ( a < x+image->get_width()) && (b >= y) && (b < y+image->get_height()) )  
+	if ( ( _a >= x ) && ( _a < x+image->get_width()) && (_b >= y) && (_b < y+image->get_height()) )  
 			return true;
 		else return false;
 }
 
-void CItem::set_id(int id)
+void CItem::set_id(int _id)
 {
-	ID = id;
+	ID = _id;
 }
 
 int CItem::get_id()