[Pingus-CVS] CVS: Games/Pingus/src/worldobjs Makefile.am,1.9,1.10 rain_generator.cxx,1.1,1.2 rain_generator.hxx,1.1,1.2 snow_generator.cxx,1.1,1.2 snow_generator.hxx,1.1,1.2

[grumbel]

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

Modified Files:
        Makefile.am rain_generator.cxx rain_generator.hxx 
        snow_generator.cxx snow_generator.hxx 
Log Message:
- made weather thingies real worldobjs

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Makefile.am 15 Sep 2002 20:33:45 -0000      1.9
+++ Makefile.am 16 Sep 2002 16:04:58 -0000      1.10
@@ -33,6 +33,8 @@
        spike.cxx                  spike.hxx         \
         switch_door.cxx            switch_door.hxx   \
         teleporter.cxx             teleporter.hxx    \
-        worldobj_group.hxx         worldobj_group.cxx
+        worldobj_group.hxx         worldobj_group.cxx \
+        rain_generator.hxx         rain_generator.cxx \
+        snow_generator.hxx         snow_generator.cxx
 
 ## EOF ##

Index: rain_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rain_generator.cxx  16 Sep 2002 15:47:35 -0000      1.1
+++ rain_generator.cxx  16 Sep 2002 16:04:58 -0000      1.2
@@ -20,11 +20,13 @@
 #include <ClanLib/Display/Display/display.h>
 #include "../world.hxx"
 #include "../particles/particle_holder.hxx"
-#include "rain_particle.hxx"
+#include "../particles/rain_particle.hxx"
 #include "../sound.hxx"
 #include "../world.hxx"
 #include "rain_generator.hxx"
 
+namespace WorldObjs {
+
 RainGenerator::RainGenerator ()
   : do_thunder (false),
     thunder_count (0)
@@ -77,5 +79,7 @@
   get_world()->get_particle_holder()->add_particle(new RainParticle(rand() % 
world->get_width(), -32));
   get_world()->get_particle_holder()->add_particle(new RainParticle(rand() % 
world->get_width(), -32));
 }
+
+} // namespace WorldObjs
 
 /* EOF */

Index: rain_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/rain_generator.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rain_generator.hxx  16 Sep 2002 15:47:35 -0000      1.1
+++ rain_generator.hxx  16 Sep 2002 16:04:58 -0000      1.2
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace WorldObjs {
+
 class RainGenerator : public WorldObj
 {
 private:
@@ -40,6 +42,8 @@
   RainGenerator (const RainGenerator&);
   RainGenerator operator= (const RainGenerator&);
 };
+
+} // namespace WorldObjs
 
 #endif
 

Index: snow_generator.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/snow_generator.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snow_generator.cxx  16 Sep 2002 15:47:35 -0000      1.1
+++ snow_generator.cxx  16 Sep 2002 16:04:58 -0000      1.2
@@ -18,9 +18,11 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "../world.hxx"
-#include "snow_particle.hxx"
-#include "snow_generator.hxx"
+#include "../particles/snow_particle.hxx"
 #include "../particles/particle_holder.hxx"
+#include "snow_generator.hxx"
+
+namespace WorldObjs {
 
 SnowGenerator::SnowGenerator()
 {
@@ -37,5 +39,7 @@
   world->get_particle_holder()->add_particle(new SnowParticle(rand() % 
world->get_width(), -32));
   world->get_particle_holder()->add_particle(new CollidingSnowParticle(rand() 
% world->get_width(), -32));
 }
+
+} // namespace WorldObjs
 
 /* EOF */

Index: snow_generator.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/worldobjs/snow_generator.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- snow_generator.hxx  16 Sep 2002 15:47:35 -0000      1.1
+++ snow_generator.hxx  16 Sep 2002 16:04:58 -0000      1.2
@@ -22,6 +22,8 @@
 
 #include "../worldobj.hxx"
 
+namespace WorldObjs {
+
 class SnowGenerator : public WorldObj
 {
 private:
@@ -36,6 +38,8 @@
   SnowGenerator (const SnowGenerator&);
   SnowGenerator operator= (const SnowGenerator&);
 };
+
+} // namespace WorldObjs
 
 #endif