[Pingus-CVS] CVS: Games/Pingus/src/particles explosive_particle.hxx,1.2,1.3 ground_particle.hxx,1.2,1.3 particle.hxx,1.2,1.3 particle_cache.hxx,1.3,1.4 particle_holder.hxx,1.2,1.3 pingu_particle.hxx,1.3,1.4 rain_generator.hxx,1.2,1.3 rain_particle.hxx,1.2,1.3 smoke_particle.hxx,1.3,1.4 snow_generator.hxx,1.2,1.3 snow_particle.hxx,1.2,1.3 weather_generator.hxx,1.2,1.3

[torangan]

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

Modified Files:
        explosive_particle.hxx ground_particle.hxx particle.hxx 
        particle_cache.hxx particle_holder.hxx pingu_particle.hxx 
        rain_generator.hxx rain_particle.hxx smoke_particle.hxx 
        snow_generator.hxx snow_particle.hxx weather_generator.hxx 
Log Message:
- added copy constructor/operator= or private declarations
- some cleanup


Index: explosive_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/explosive_particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- explosive_particle.hxx      24 Jun 2002 22:52:59 -0000      1.2
+++ explosive_particle.hxx      23 Aug 2002 15:49:56 -0000      1.3
@@ -40,6 +40,10 @@
   ///
   bool is_alive(void);
   void detonate ();
+  
+private:
+  ExplosiveParticle (const ExplosiveParticle&);
+  ExplosiveParticle operator= (const ExplosiveParticle&);
 };
 
 #endif

Index: ground_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/ground_particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ground_particle.hxx 24 Jun 2002 22:52:59 -0000      1.2
+++ ground_particle.hxx 23 Aug 2002 15:49:56 -0000      1.3
@@ -32,6 +32,10 @@
 
   void update(float delta);
   void draw_offset(int ofx, int ofy, float s);
+  
+private:
+  GroundParticle (const GroundParticle&);
+  GroundParticle operator= (const GroundParticle&);
 };
 
 #endif

Index: particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- particle.hxx        24 Jun 2002 22:52:59 -0000      1.2
+++ particle.hxx        23 Aug 2002 15:49:56 -0000      1.3
@@ -26,8 +26,6 @@
 
 #include "../worldobj.hxx"
 
-
-///
 class Particle : public WorldObj
 {
 protected:
@@ -60,12 +58,12 @@
 
   /// Draw the particle with the correct zoom resize
   virtual void draw_offset(int, int, float);
+  
+private:
+  Particle (const Particle&);
+  Particle operator= (const Particle&);
 };
 
 #endif
 
 /* EOF */
-
-
-
-

Index: particle_cache.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle_cache.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- particle_cache.hxx  16 Aug 2002 13:03:36 -0000      1.3
+++ particle_cache.hxx  23 Aug 2002 15:49:56 -0000      1.4
@@ -20,26 +20,21 @@
 #ifndef HEADER_PINGUS_PARTICLES_PARTICLE_CACHE_HXX
 #define HEADER_PINGUS_PARTICLES_PARTICLE_CACHE_HXX
 
-#include <vector>
 #include "../pingus.hxx"
+#include <vector>
 
 class Particle;
 
-///
 class ParticleCache
 {
 private:
-  ///
   std::vector<Particle*>::iterator position;
-  ///
   std::vector<Particle*> particles;
 public:
-  ///
   ParticleCache();
-  ///
   ~ParticleCache();
 
-  /// Returns an allready allocated object
+  /// Returns an already allocated object
   Particle* create();
   
   /// Allocates the given number of objects
@@ -47,8 +42,11 @@
   
   /// Deletes all allocated objects
   void clear();
-}///
-;
+  
+private:
+  ParticleCache (const ParticleCache&);
+  ParticleCache operator= (const ParticleCache&);
+};
 
 #endif
 

Index: particle_holder.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/particle_holder.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- particle_holder.hxx 24 Jun 2002 22:52:59 -0000      1.2
+++ particle_holder.hxx 23 Aug 2002 15:49:56 -0000      1.3
@@ -25,37 +25,29 @@
 
 class Particle;
 
-///
 class ParticleHolder : public std::list<Particle*>
 {
 private:
-  ///
   std::vector<Particle*> all_particles;
-  ///
   ParticleCache     pingu_particles;
   
 public:
-  ///
-  ParticleHolder();
-  ///
-  virtual ~ParticleHolder();
+  ParticleHolder ();
+  virtual ~ParticleHolder ();
 
-  ///
-  void update(float delta);
-  ///
-  void draw_offset(int, int, float); /// const;
-  void add_pingu_explo(int x, int y);
-  ///
-  void add_particle(Particle* p);
+  void update (float delta);
+  void draw_offset (int, int, float); /// const;
+  void add_pingu_explo (int x, int y);
+  void add_particle (Particle* p);
   
-  ///
-  void init_particles();
-  ///
-  void clear_particles();
-  ///
-  void add_pingu_particle(int, int, float, float);
-}///
-;
+  void init_particles ();
+  void clear_particles ();
+  void add_pingu_particle (int, int, float, float);
+  
+private:
+  ParticleHolder (const ParticleHolder&);
+  ParticleHolder operator= (const ParticleHolder&);
+};
 
 #endif
 

Index: pingu_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingu_particle.hxx  26 Jun 2002 11:23:54 -0000      1.3
+++ pingu_particle.hxx  23 Aug 2002 15:49:56 -0000      1.4
@@ -37,6 +37,10 @@
   void init(int x, int y, float x_a, float y_a);
   void draw_offset(int ofx, int ofy, float s);
   void update(float delta);
+  
+private:
+  PinguParticle (const PinguParticle&);
+  PinguParticle operator= (const PinguParticle&);
 };
 
 #endif

Index: rain_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/rain_generator.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rain_generator.hxx  24 Jun 2002 22:52:59 -0000      1.2
+++ rain_generator.hxx  23 Aug 2002 15:49:56 -0000      1.3
@@ -33,6 +33,10 @@
   virtual ~RainGenerator ();
   virtual void update(float delta);
   virtual void draw_offset(int x, int y, float s = 1.0f);
+  
+private:
+  RainGenerator (const RainGenerator&);
+  RainGenerator operator= (const RainGenerator&);
 };
 
 #endif

Index: rain_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/rain_particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rain_particle.hxx   24 Jun 2002 22:52:59 -0000      1.2
+++ rain_particle.hxx   23 Aug 2002 15:49:56 -0000      1.3
@@ -43,6 +43,10 @@
   virtual void draw_offset(int, int, float);
   virtual void update(float delta);
   virtual bool is_alive();
+  
+private:
+  RainParticle (const RainParticle&);
+  RainParticle operator= (const RainParticle&);
 };
 
 #endif

Index: smoke_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smoke_particle.hxx  28 Jun 2002 17:48:42 -0000      1.3
+++ smoke_particle.hxx  23 Aug 2002 15:49:56 -0000      1.4
@@ -22,19 +22,23 @@
 
 #include "particle.hxx"
 
-///
 class SmokeParticle : public Particle
 {
 private:
   int time;
   static CL_Surface surf1;
   static CL_Surface surf2;
+  
 public:
-  SmokeParticle();
-  SmokeParticle(int, int, float, float);
+  SmokeParticle ();
+  SmokeParticle (int, int, float, float);
 
-  void update(float delta);
-  void draw_offset(int ofx, int ofy, float s);
+  void update (float delta);
+  void draw_offset (int ofx, int ofy, float s);
+  
+private:
+  SmokeParticle (const SmokeParticle&);
+  SmokeParticle operator= (const SmokeParticle&);
 };
 
 #endif

Index: snow_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/snow_generator.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snow_generator.hxx  24 Jun 2002 22:52:59 -0000      1.2
+++ snow_generator.hxx  23 Aug 2002 15:49:56 -0000      1.3
@@ -27,12 +27,14 @@
 private:
 
 public:
-  ///
-  SnowGenerator();
-  ///
-  virtual ~SnowGenerator();
-  ///
-  virtual void update(float delta);
+  SnowGenerator ();
+  virtual ~SnowGenerator ();
+
+  virtual void update (float delta);
+  
+private:
+  SnowGenerator (const SnowGenerator&);
+  SnowGenerator operator= (const SnowGenerator&);
 };
 
 #endif

Index: snow_particle.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/snow_particle.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snow_particle.hxx   24 Jun 2002 22:52:59 -0000      1.2
+++ snow_particle.hxx   23 Aug 2002 15:49:56 -0000      1.3
@@ -22,22 +22,20 @@
 
 #include "particle.hxx"
 
-///
 class SnowParticle : public Particle
 {
-private:
-
 public:
-  SnowParticle();
-  ///
-  SnowParticle(int x, int y);
-  ///
-  void init(int x, int y);
-  ///
-  virtual ~SnowParticle();
+  SnowParticle ();
+  SnowParticle (int x, int y);
+  void init (int x, int y);
+  virtual ~SnowParticle ();
 
-  virtual void update(float delta);
-  virtual bool is_alive();
+  virtual void update (float delta);
+  virtual bool is_alive ();
+  
+private:
+  SnowParticle (const SnowParticle&); 
+  SnowParticle operator= (const SnowParticle&);
 };
 
 class CollidingSnowParticle : public SnowParticle
@@ -45,13 +43,18 @@
 private:
   bool alive;
   static CL_Surface ground_snow;
+  
 public:
-  CollidingSnowParticle();
-  CollidingSnowParticle(int x, int y);
-  virtual ~CollidingSnowParticle();
+  CollidingSnowParticle ();
+  CollidingSnowParticle (int x, int y);
+  virtual ~CollidingSnowParticle ();
 
-  virtual void update(float delta);
-  virtual bool is_alive();  
+  virtual void update (float delta);
+  virtual bool is_alive ();  
+  
+private:
+  CollidingSnowParticle (const CollidingSnowParticle&);
+  CollidingSnowParticle operator= (const CollidingSnowParticle&);
 };
 
 #endif

Index: weather_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/weather_generator.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- weather_generator.hxx       24 Jun 2002 22:52:59 -0000      1.2
+++ weather_generator.hxx       23 Aug 2002 15:49:56 -0000      1.3
@@ -24,29 +24,23 @@
 
 class WeatherData;
 
-namespace boost {
-  template <class T> class shared_ptr;
-}
-
 class WeatherGenerator : public WorldObj
 {
 private:
   
 public:
-  ///
   WeatherGenerator() {}
-  ///
   virtual ~WeatherGenerator() {}
-  ///
   virtual void update(float delta) =0;
-  ///
   float get_z_pos() const { return 1000; }
-  ///
   void draw_offset(int, int, float) {}
 
-
   /** Generate an WeatherGenerator which fits to the given data */
   static WorldObj* create(WeatherData);
+  
+private:
+  WeatherGenerator (const WeatherGenerator&);
+  WeatherGenerator operator= (const WeatherGenerator&);
 };
 
 #endif