[Pingus-CVS] CVS: Games/Pingus/src/particles pingu_particle_holder.cxx,1.2,1.3 pingu_particle_holder.hxx,1.2,1.3 rain_particle_holder.cxx,1.2,1.3 rain_particle_holder.hxx,1.2,1.3 smoke_particle_holder.cxx,1.1,1.2 smoke_particle_holder.hxx,1.1,1.2 snow_particle_holder.cxx,1.2,1.3 snow_particle_holder.hxx,1.2,1.3

[torangan]

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

Modified Files:
        pingu_particle_holder.cxx pingu_particle_holder.hxx 
        rain_particle_holder.cxx rain_particle_holder.hxx 
        smoke_particle_holder.cxx smoke_particle_holder.hxx 
        snow_particle_holder.cxx snow_particle_holder.hxx 
Log Message:
added namespace Particles around all particle holders


Index: pingu_particle_holder.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle_holder.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_particle_holder.cxx   1 Jan 2003 20:57:26 -0000       1.2
+++ pingu_particle_holder.cxx   25 Jan 2003 11:03:58 -0000      1.3
@@ -24,9 +24,13 @@
 #include "../world.hxx"
 #include "pingu_particle_holder.hxx"
 
-const float x_collision_decrease = 0.3f;
-const float y_collision_decrease = 0.6f;
 
+namespace Particles {
+
+namespace {
+  const float x_collision_decrease = 0.3f;
+  const float y_collision_decrease = 0.6f;
+}
 
 PinguParticleHolder::PinguParticle::PinguParticle (int x, int y)
   : livetime(50 + (rand() % 50)),
@@ -159,5 +163,7 @@
       gc.draw(surface, it->pos, it->use_frame2);
     }
 }
+
+} // namespace Particles
 
 /* EOF */

Index: pingu_particle_holder.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle_holder.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pingu_particle_holder.hxx   1 Jan 2003 20:57:26 -0000       1.2
+++ pingu_particle_holder.hxx   25 Jan 2003 11:03:58 -0000      1.3
@@ -27,6 +27,8 @@
 
 class GraphicContext;
 
+namespace Particles {
+
 class PinguParticleHolder : public WorldObj
 {
   struct PinguParticle {
@@ -62,6 +64,8 @@
   PinguParticleHolder (const PinguParticleHolder&);
   PinguParticleHolder& operator= (const PinguParticleHolder&);
 };
+
+} // namespace Particles
 
 #endif
 

Index: rain_particle_holder.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/rain_particle_holder.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rain_particle_holder.cxx    31 Dec 2002 15:09:33 -0000      1.2
+++ rain_particle_holder.cxx    25 Jan 2003 11:03:58 -0000      1.3
@@ -25,6 +25,7 @@
 #include "../world.hxx"
 #include "rain_particle_holder.hxx"
 
+namespace Particles {
 
 RainParticleHolder::RainParticle::RainParticle(int x, int y)
   : alive(true), splash(false), use_rain2_surf(false), splash_counter(0), 
splash_frame(0), pos(Vector(x, y))
@@ -128,5 +129,7 @@
 {
   world_width = width;
 }
+
+} // namespace Particles
 
 /* EOF */

Index: rain_particle_holder.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/rain_particle_holder.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- rain_particle_holder.hxx    31 Dec 2002 15:09:33 -0000      1.2
+++ rain_particle_holder.hxx    25 Jan 2003 11:03:58 -0000      1.3
@@ -27,6 +27,8 @@
 
 class GraphicContext;
 
+namespace Particles {
+
 class RainParticleHolder : public WorldObj
 {
   struct RainParticle {
@@ -73,6 +75,8 @@
   RainParticleHolder (const RainParticleHolder&);
   RainParticleHolder& operator= (const RainParticleHolder&);
 };
+
+} // namespace Particles
 
 #endif
 

Index: smoke_particle_holder.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle_holder.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smoke_particle_holder.cxx   28 Dec 2002 16:10:18 -0000      1.1
+++ smoke_particle_holder.cxx   25 Jan 2003 11:03:58 -0000      1.2
@@ -23,6 +23,8 @@
 #include "smoke_particle_holder.hxx"
 
 
+namespace Particles {
+
 SmokeParticleHolder::SmokeParticle::SmokeParticle (int x, int y, float vel_x, 
float vel_y)
   : pos(Vector(x,y)), velocity(Vector(vel_x, vel_y))
 {
@@ -85,5 +87,7 @@
              gc.draw(surf2, it->pos);
     }
 }
+
+} // namespace Particles
 
 /* EOF */

Index: smoke_particle_holder.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/smoke_particle_holder.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- smoke_particle_holder.hxx   28 Dec 2002 16:10:18 -0000      1.1
+++ smoke_particle_holder.hxx   25 Jan 2003 11:03:58 -0000      1.2
@@ -27,6 +27,8 @@
 
 class GraphicContext;
 
+namespace Particles {
+
 class SmokeParticleHolder : public WorldObj
 {
   struct SmokeParticle {
@@ -62,6 +64,8 @@
   SmokeParticleHolder (const SmokeParticleHolder&);
   SmokeParticleHolder& operator= (const SmokeParticleHolder&);
 };
+
+} // namespace Particles
 
 #endif
 

Index: snow_particle_holder.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/snow_particle_holder.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snow_particle_holder.cxx    31 Dec 2002 14:34:19 -0000      1.2
+++ snow_particle_holder.cxx    25 Jan 2003 11:03:58 -0000      1.3
@@ -26,6 +26,7 @@
 #include "../world.hxx"
 #include "snow_particle_holder.hxx"
 
+namespace Particles {
 
 SnowParticleHolder::SnowParticle::SnowParticle (int x, int y, bool colliding_)
   : alive(true),
@@ -147,5 +148,7 @@
         }
     }
 }
+
+} //namespace Particles
 
 /* EOF */

Index: snow_particle_holder.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/snow_particle_holder.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- snow_particle_holder.hxx    31 Dec 2002 14:34:19 -0000      1.2
+++ snow_particle_holder.hxx    25 Jan 2003 11:03:58 -0000      1.3
@@ -27,6 +27,8 @@
 
 class GraphicContext;
 
+namespace Particles {
+
 class SnowParticleHolder : public WorldObj
 {
 private:
@@ -71,6 +73,8 @@
   SnowParticleHolder (const SnowParticleHolder&);
   SnowParticleHolder& operator= (const SnowParticleHolder&);
 };
+
+} //namespace Particles
 
 #endif