[Pingus-CVS] CVS: Games/Pingus/src world.cxx,1.35,1.36 world.hxx,1.21,1.22

[torangan]

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

Modified Files:
        world.cxx world.hxx 
Log Message:
added namespace Particles around all particle holders


Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- world.cxx   31 Dec 2002 15:09:33 -0000      1.35
+++ world.cxx   25 Jan 2003 11:03:58 -0000      1.36
@@ -57,10 +57,10 @@
   : gfx_map(new PingusSpotMap(plf)),
     game_time(new GameTime (game_speed)),
     do_armageddon(false),
-    pingu_particle_holder(new PinguParticleHolder()),
-    rain_particle_holder(new RainParticleHolder()),
-    smoke_particle_holder(new SmokeParticleHolder()),
-    snow_particle_holder(new SnowParticleHolder()),
+    pingu_particle_holder(new Particles::PinguParticleHolder()),
+    rain_particle_holder(new Particles::RainParticleHolder()),
+    smoke_particle_holder(new Particles::SmokeParticleHolder()),
+    snow_particle_holder(new Particles::SnowParticleHolder()),
     pingus(new PinguHolder(plf)),
     colmap(gfx_map->get_colmap()),
     view(0)

Index: world.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.hxx,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- world.hxx   28 Dec 2002 16:57:38 -0000      1.21
+++ world.hxx   25 Jan 2003 11:03:58 -0000      1.22
@@ -32,10 +32,6 @@
 class Hotspot;
 class Liquid;
 class PLF;
-class PinguParticleHolder;
-class RainParticleHolder;
-class SmokeParticleHolder;
-class SnowParticleHolder;
 class PinguHolder;
 class PinguMap;
 class Pingu;
@@ -47,6 +43,14 @@
 class SmallMap;
 class GraphicContext;
 
+namespace Particles {
+  class PinguParticleHolder;
+  class RainParticleHolder;
+  class SmokeParticleHolder;
+  class SnowParticleHolder;
+}
+
+
 /** The World holds all objects of the pingu enviroment. 
     
     It holds the pingus, traps, exits, entrances, etc.. It keeps
@@ -72,11 +76,11 @@
   typedef std::vector<WorldObj*>::iterator WorldObjIter;
   
   // These pointers hold objects and must be deleted
-  PinguParticleHolder* pingu_particle_holder;
-  RainParticleHolder*  rain_particle_holder;
-  SmokeParticleHolder* smoke_particle_holder;
-  SnowParticleHolder*  snow_particle_holder;
-  PinguHolder*         pingus;
+  Particles::PinguParticleHolder* pingu_particle_holder;
+  Particles::RainParticleHolder*  rain_particle_holder;
+  Particles::SmokeParticleHolder* smoke_particle_holder;
+  Particles::SnowParticleHolder*  snow_particle_holder;
+  PinguHolder*                    pingus;
 
   // Pointers which are references to objects from other classes
   ActionHolder*   action_holder;
@@ -121,16 +125,16 @@
   PinguMap* get_gfx_map();
 
   /** @return A pointer to the worlds pingu particle holder */
-  PinguParticleHolder* get_pingu_particle_holder () { return 
pingu_particle_holder; }
+  Particles::PinguParticleHolder* get_pingu_particle_holder () { return 
pingu_particle_holder; }
   
   /** @return A pointer to the worlds rain particle holder */
-  RainParticleHolder* get_rain_particle_holder () { return 
rain_particle_holder; }
+  Particles::RainParticleHolder* get_rain_particle_holder () { return 
rain_particle_holder; }
 
   /** @return A pointer to the worlds smoke particle holder */
-  SmokeParticleHolder* get_smoke_particle_holder () { return 
smoke_particle_holder; }
+  Particles::SmokeParticleHolder* get_smoke_particle_holder () { return 
smoke_particle_holder; }
 
   /** @return A pointer to the worlds snow particle holder */
-  SnowParticleHolder* get_snow_particle_holder () { return 
snow_particle_holder; }
+  Particles::SnowParticleHolder* get_snow_particle_holder () { return 
snow_particle_holder; }
 
     /** @return true if the world is currently doing an armageddon */
   bool check_armageddon() { return do_armageddon; }