[Pingus-CVS] CVS: Games/Pingus/src/gui gui_manager.cxx,1.14,1.15 surface_button.cxx,1.4,1.5

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/gui
In directory dark:/tmp/cvs-serv13100/src/gui

Modified Files:
        gui_manager.cxx surface_button.cxx 
Log Message:
- applied the outstanding patches from the ML
- optimized force_vector a little 


Index: gui_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/gui_manager.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gui_manager.cxx     4 Oct 2002 11:38:29 -0000       1.14
+++ gui_manager.cxx     14 Oct 2002 11:15:15 -0000      1.15
@@ -97,14 +97,14 @@
 GUIManager::add (Component* c, bool delete_component) 
 { 
   components.push_back(c); 
-  if(delete_component);
+  UNUSED_ARG(delete_component);
 }
 
 void
 GUIManager::remove (Component* c)
 {
   /* components.erase(c); */ 
-  if(c);
+  UNUSED_ARG(c);
 }
 
 Component*

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/surface_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- surface_button.cxx  4 Sep 2002 14:55:12 -0000       1.4
+++ surface_button.cxx  14 Oct 2002 11:15:15 -0000      1.5
@@ -56,7 +56,7 @@
            << std::endl;*/
 
   return x > x_pos && x < x_pos + int(button_surface.get_width ())
-    && y > y_pos && y < y_pos + int(button_surface.get_height ());
+      && y > y_pos && y < y_pos + int(button_surface.get_height ());
 }
 
 void
@@ -65,7 +65,8 @@
   std::cout << "XXXXXXXXX press" << std::endl;
   pressed = true;
   
-  if(x); if(y);
+  UNUSED_ARG(x);
+  UNUSED_ARG(y);
 }
 
 void
@@ -74,7 +75,8 @@
   std::cout << "XXXXXXXXX release" << std::endl;
   pressed = false;
   
-  if(x); if(y);
+  UNUSED_ARG(x);
+  UNUSED_ARG(y);
 }
 
 void
@@ -96,7 +98,8 @@
 {
   std::cout << "Surfacebutton got click" << std::endl;
   
-  if(x); if(y);
+  UNUSED_ARG(x);
+  UNUSED_ARG(y);
 }
 
 /* EOF */