[Pingus-CVS] CVS: Games/Pingus/src action_button.cxx,1.8,1.9 button_panel.cxx,1.9,1.10 client.cxx,1.15,1.16 credits.hxx,1.3,1.4 gui_obj.hxx,1.3,1.4 playfield.cxx,1.14,1.15 playfield.hxx,1.8,1.9 smallmap.cxx,1.9,1.10 story.cxx,1.3,1.4 surface_button.cxx,1.7,1.8 surface_button.hxx,1.6,1.7

[torangan]

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

Modified Files:
        action_button.cxx button_panel.cxx client.cxx credits.hxx 
        gui_obj.hxx playfield.cxx playfield.hxx smallmap.cxx story.cxx 
        surface_button.cxx surface_button.hxx 
Log Message:
- some more warnings squished


Index: action_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/action_button.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- action_button.cxx   3 Aug 2002 12:00:58 -0000       1.8
+++ action_button.cxx   14 Aug 2002 12:45:01 -0000      1.9
@@ -238,7 +238,7 @@
 void
 ArmageddonButton::on_primary_button_click (int x, int y)
 {
-  if  (pressed)
+  if (pressed)
     {
       server->set_armageddon();
     }
@@ -246,6 +246,8 @@
     {
       pressed = true;
     }
+    
+  if(x); if(y);
 }
 
 ForwardButton::ForwardButton(Server* s, int x, int y) 
@@ -290,6 +292,8 @@
 ForwardButton::on_primary_button_click (int x, int y)
 {
   server->set_fast_forward(!server->get_fast_forward());
+  
+  if(x); if(y);
 }
 
 PauseButton::PauseButton(Server* s, int x, int y) 
@@ -330,6 +334,8 @@
 PauseButton::on_primary_button_click (int x, int y)
 {
   server->set_pause(!server->get_pause ());
+  
+  if(x); if(y);
 }
 
 /* EOF */

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- button_panel.cxx    2 Aug 2002 22:55:19 -0000       1.9
+++ button_panel.cxx    14 Aug 2002 12:45:01 -0000      1.10
@@ -189,6 +189,7 @@
 void
 ButtonPanel::on_primary_button_release(int x, int y)
 {
+  if(x); if(y);
 }
 
 /// Select the next action

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- client.cxx  9 Aug 2002 22:02:13 -0000       1.15
+++ client.cxx  14 Aug 2002 12:45:01 -0000      1.16
@@ -152,6 +152,8 @@
     CL_System::sleep (int(1000 * (wannabe_delta - delta.get ())));
     }
     }*/
+    
+  if(delta);
 }
 
 #if 0

Index: credits.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- credits.hxx 4 Aug 2002 15:42:23 -0000       1.3
+++ credits.hxx 14 Aug 2002 12:45:02 -0000      1.4
@@ -52,7 +52,7 @@
 
   Credits();
 public:
-  ~Credits();
+  virtual ~Credits();
 
   void init ();
   void update (const GameDelta& delta);

Index: gui_obj.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/gui_obj.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gui_obj.hxx 29 Jul 2002 10:44:12 -0000      1.3
+++ gui_obj.hxx 14 Aug 2002 12:45:02 -0000      1.4
@@ -43,7 +43,7 @@
   virtual void draw_clipped();
 
   /** Return true if the mouse is over this GUI component */
-  virtual bool mouse_over (int x, int y) { return false; }
+  virtual bool mouse_over (int x, int y) { if(x); if(y); return false; }
 
   /// Draw the gui element
   virtual void draw() = 0;

Index: playfield.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- playfield.cxx       12 Aug 2002 22:52:04 -0000      1.14
+++ playfield.cxx       14 Aug 2002 12:45:02 -0000      1.15
@@ -223,6 +223,8 @@
 Playfield::on_secondary_button_release (int x, int y)
 {
   mouse_scrolling = false;
+  
+  if(x); if(y);
 }
 
 void

Index: playfield.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/playfield.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- playfield.hxx       2 Aug 2002 22:55:19 -0000       1.8
+++ playfield.hxx       14 Aug 2002 12:45:02 -0000      1.9
@@ -103,7 +103,7 @@
   void set_server(Server*);
   void set_client(Client*);
 
-  bool is_at (int x, int y) { return true; }
+  bool is_at (int x, int y) { if(x); if(y); return true; }
 };
 
 #endif

Index: smallmap.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/smallmap.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smallmap.cxx        2 Aug 2002 22:55:19 -0000       1.9
+++ smallmap.cxx        14 Aug 2002 12:45:02 -0000      1.10
@@ -255,6 +255,8 @@
 SmallMap::on_primary_button_release(int x, int y)
 {
   scroll_mode = false;
+  
+  if(x); if(y);
 }
 
 void

Index: story.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/story.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- story.cxx   1 Aug 2002 21:40:01 -0000       1.3
+++ story.cxx   14 Aug 2002 12:45:02 -0000      1.4
@@ -135,6 +135,8 @@
 bool
 Story::is_at (int x, int y)
 {
+  if(x); if(y);
+
   std::cout << "bla" << std::endl; 
   return true;
 }

Index: surface_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- surface_button.cxx  4 Aug 2002 15:42:23 -0000       1.7
+++ surface_button.cxx  14 Aug 2002 12:45:02 -0000      1.8
@@ -114,6 +114,7 @@
 void
 SurfaceButton::update (float delta)
 {    
+  if(delta);
 }
 
 void

Index: surface_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/surface_button.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- surface_button.hxx  2 Aug 2002 22:55:19 -0000       1.6
+++ surface_button.hxx  14 Aug 2002 12:45:02 -0000      1.7
@@ -62,7 +62,7 @@
   void on_pointer_press ();
   void on_pointer_release ();
   
-  void on_primary_button_click (int x, int y) { on_click (); }
+  void on_primary_button_click (int x, int y) { on_click (); if(x); if(y); }
 
   virtual void on_click () =0;
 };