[Pingus-CVS] CVS: Games/Pingus/src/traps bumper.hxx,1.2,1.3 fake_exit.hxx,1.2,1.3 guillotine.hxx,1.2,1.3 hammer.cxx,1.6,1.7 hammer.hxx,1.2,1.3 laser_exit.cxx,1.4,1.5 laser_exit.hxx,1.2,1.3 smasher.hxx,1.2,1.3 spike.hxx,1.2,1.3

[torangan]

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

Modified Files:
        bumper.hxx fake_exit.hxx guillotine.hxx hammer.cxx hammer.hxx 
        laser_exit.cxx laser_exit.hxx smasher.hxx spike.hxx 
Log Message:
- added copy constructor/operator= or private declarations
- some cleanup


Index: bumper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/bumper.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bumper.hxx  24 Jun 2002 22:52:59 -0000      1.2
+++ bumper.hxx  23 Aug 2002 15:49:56 -0000      1.3
@@ -36,7 +36,13 @@
   void draw_offset(int x, int y, float s);
   void draw_colmap();
   void update(float delta);
+  
+protected:
   void catch_pingu(Pingu* pingu);
+  
+private:
+  Bumper (const Bumper&);
+  Bumper operator= (const Bumper&);
 };
 
 #endif

Index: fake_exit.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/fake_exit.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fake_exit.hxx       24 Jun 2002 22:52:59 -0000      1.2
+++ fake_exit.hxx       23 Aug 2002 15:49:56 -0000      1.3
@@ -34,6 +34,8 @@
   virtual ~FakeExit();
   
   void update(float delta);
+  
+protected:
   void catch_pingu(Pingu*);
 };
 

Index: guillotine.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/guillotine.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- guillotine.hxx      24 Jun 2002 22:52:59 -0000      1.2
+++ guillotine.hxx      23 Aug 2002 15:49:56 -0000      1.3
@@ -35,12 +35,18 @@
   Direction  direction;
   GameCounter idle_counter;
 public:
-  Guillotine(const TrapData& data);
+  Guillotine (const TrapData& data);
   virtual ~Guillotine();
   
-  void update(float delta);
-  void draw_offset(int x, int y, float s);
-  void catch_pingu(Pingu*);
+  void update (float delta);
+  void draw_offset (int x, int y, float s);
+  
+protected:
+  void catch_pingu (Pingu*);
+  
+private:
+  Guillotine (const Guillotine&);
+  Guillotine operator= (const Guillotine&);
 };
 
 #endif

Index: hammer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- hammer.cxx  22 Aug 2002 02:33:56 -0000      1.6
+++ hammer.cxx  23 Aug 2002 15:49:56 -0000      1.7
@@ -17,7 +17,6 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-#include "../pingus.hxx"
 #include "../world.hxx"
 #include "hammer.hxx"
 #include "../pingus_resource.hxx"

Index: hammer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/hammer.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- hammer.hxx  24 Jun 2002 22:52:59 -0000      1.2
+++ hammer.hxx  23 Aug 2002 15:49:56 -0000      1.3
@@ -34,7 +34,13 @@
   virtual ~Hammer();
 
   void update(float delta);
+  
+protected:
   void catch_pingu(Pingu*);
+  
+private:
+  Hammer (const Hammer&);
+  Hammer operator= (const Hammer&);
 };
 
 #endif

Index: laser_exit.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/laser_exit.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- laser_exit.cxx      28 Jun 2002 15:12:23 -0000      1.4
+++ laser_exit.cxx      23 Aug 2002 15:49:56 -0000      1.5
@@ -77,7 +77,7 @@
          if (!(pingu->get_action() && pingu->get_action()->get_name() == 
"LaserKill")) 
            {
              killing = true;
-             pingu->set_action(Laserkill);
+             pingu->set_action(Pingus::Actions::Laserkill);
            }
        }
     }

Index: laser_exit.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/laser_exit.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- laser_exit.hxx      24 Jun 2002 22:52:59 -0000      1.2
+++ laser_exit.hxx      23 Aug 2002 15:49:56 -0000      1.3
@@ -24,17 +24,22 @@
 
 class TrapData;
 
-///
 class LaserExit : public Trap
 {
 private:
   bool killing;
 public:
-  LaserExit(const TrapData&);
+  LaserExit (const TrapData&);
   virtual ~LaserExit();
 
-  void update(float delta);
-  void catch_pingu(Pingu*);
+  void update (float delta);
+  
+protected:
+  void catch_pingu (Pingu*);
+  
+private:
+  LaserExit (const LaserExit&);
+  LaserExit operator= (const LaserExit&);
 }; 
 
 

Index: smasher.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/smasher.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smasher.hxx 24 Jun 2002 22:52:59 -0000      1.2
+++ smasher.hxx 23 Aug 2002 15:49:56 -0000      1.3
@@ -24,7 +24,6 @@
 
 class TrapData;
 
-///
 class Smasher : public Trap
 {
 private:
@@ -33,13 +32,19 @@
   int  count;
 
 public:
-  Smasher(const TrapData& data);
-  virtual ~Smasher();
+  Smasher (const TrapData& data);
+  virtual ~Smasher ();
 
-  void draw_offset(int x, int y, float s);
-  void draw_colmap();
-  void update(float delta);
-  void catch_pingu(Pingu* pingu);
+  void draw_offset (int x, int y, float s);
+  void draw_colmap ();
+  void update (float delta);
+  
+protected:
+  void catch_pingu (Pingu* pingu);
+  
+private:
+  Smasher (const Smasher&);
+  Smasher operator= (const Smasher&);
 };
 
 #endif

Index: spike.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/traps/spike.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- spike.hxx   24 Jun 2002 22:52:59 -0000      1.2
+++ spike.hxx   23 Aug 2002 15:49:56 -0000      1.3
@@ -24,19 +24,24 @@
 
 class TrapData;
 
-///
 class Spike : public Trap
 {
 private:
   bool killing;
 
 public:
-  Spike(const TrapData& data);
-  virtual ~Spike();
+  Spike (const TrapData& data);
+  virtual ~Spike ();
   
-  void draw_offset(int x_of, int y_of, float s = 1.0);
-  void update(float delta);
-  void catch_pingu(Pingu*);
+  void draw_offset (int x_of, int y_of, float s = 1.0);
+  void update (float delta);
+  
+protected:
+  void catch_pingu (Pingu*);
+  
+private:
+  Spike (const Spike&);
+  Spike operator= (const Spike&);
 };
 
 #endif