[Pingus-CVS] CVS: Games/Pingus/src/gui component.hxx,1.6,1.7 gui_manager.hxx,1.6,1.7 root_gui_manager.cxx,1.4,1.5 surface_button.cxx,1.2,1.3

[torangan]

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

Modified Files:
        component.hxx gui_manager.hxx root_gui_manager.cxx 
        surface_button.cxx 
Log Message:
- some more warnings squished


Index: component.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/component.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- component.hxx       2 Aug 2002 22:55:19 -0000       1.6
+++ component.hxx       14 Aug 2002 12:45:02 -0000      1.7
@@ -30,25 +30,25 @@
 
   public:
     virtual void draw () =0;
-    virtual void update (float delta) {}
+    virtual void update (float delta) { if(delta);}
     
-    virtual bool is_at (int x, int y) { return false; }
+    virtual bool is_at (int x, int y) { if(x); if (y); return false; }
 
     // Events
     /** Gets issued once the primary button is pressed */
-    virtual void on_primary_button_press (int x, int y) {}
+    virtual void on_primary_button_press (int x, int y) { if(x); if (y); }
     
     /** Gets issued once the primary button is released */
-    virtual void on_primary_button_release (int x, int y) {}
+    virtual void on_primary_button_release (int x, int y) { if(x); if (y); }
 
-    virtual void on_secondary_button_press (int x, int y) {}
-    virtual void on_secondary_button_release (int x, int y) {}
+    virtual void on_secondary_button_press (int x, int y) { if(x); if (y); }
+    virtual void on_secondary_button_release (int x, int y) { if(x); if (y); }
 
     /** Gets emmited when a button is pressed and released over the
        same component */
-    virtual void on_primary_button_click (int x, int y) {}
+    virtual void on_primary_button_click (int x, int y) { if(x); if (y); }
 
-    virtual void on_secondary_button_click (int x, int y) {}
+    virtual void on_secondary_button_click (int x, int y) { if(x); if (y); }
 
     /** Emmitted when pointer enters the region of the component */
     virtual void on_pointer_enter () {}
@@ -58,7 +58,7 @@
 
     /** Emitted when the pointer moved, x and y are the new pointer
        coordinates */
-    virtual void on_pointer_move (int x, int y) {}
+    virtual void on_pointer_move (int x, int y) { if(x); if (y); }
 
     // status functions for use in the update() function
     /** return true if currently pressed */

Index: gui_manager.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/gui_manager.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gui_manager.hxx     2 Aug 2002 22:55:19 -0000       1.6
+++ gui_manager.hxx     14 Aug 2002 12:45:02 -0000      1.7
@@ -66,7 +66,7 @@
     
     virtual void draw ();
     virtual void update (const GameDelta& delta);
-    virtual void update (float delta) {}
+    virtual void update (float delta) { if(delta); }
 
     /** Called once an unhandled event is recieved */
     virtual void unhandled_event ();

Index: root_gui_manager.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/root_gui_manager.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- root_gui_manager.cxx        30 Jul 2002 14:57:26 -0000      1.4
+++ root_gui_manager.cxx        14 Aug 2002 12:45:02 -0000      1.5
@@ -40,6 +40,8 @@
   assert (controller);
   //GUIManager::update (delta);
   //process_input (controller->get_events ());
+  
+  if (delta);
 }
 
 /* EOF */

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui/surface_button.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- surface_button.cxx  2 Aug 2002 22:55:19 -0000       1.2
+++ surface_button.cxx  14 Aug 2002 12:45:02 -0000      1.3
@@ -65,6 +65,8 @@
 {
   std::cout << "XXXXXXXXX press" << std::endl;
   pressed = true;
+  
+  if(x); if(y);
 }
 
 void
@@ -72,6 +74,8 @@
 {
   std::cout << "XXXXXXXXX release" << std::endl;
   pressed = false;
+  
+  if(x); if(y);
 }
 
 void
@@ -92,6 +96,8 @@
 SurfaceButton::on_primary_button_click (int x, int y)
 {
   std::cout << "Surfacebutton got click" << std::endl;
+  
+  if(x); if(y);
 }
 
 /* EOF */