[Pingus-CVS] CVS: Games/Pingus/src/particles rain_particle.cxx,1.1,1.2 snow_particle.cxx,1.3,1.4

[grumbel]

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

Modified Files:
        rain_particle.cxx snow_particle.cxx 
Log Message:
- final merge of PixelStatus and GroundpieceData::GPType, might need some more 
testing

Index: rain_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/rain_particle.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- rain_particle.cxx   12 Jun 2002 19:11:31 -0000      1.1
+++ rain_particle.cxx   25 Jun 2002 18:15:18 -0000      1.2
@@ -97,8 +97,8 @@
     }
   else
     {
-      if (world->get_colmap()->getpixel(int(pos.x), int(pos.y)) != 
ColMap::NOTHING
-         && world->get_colmap()->getpixel(int(pos.x), int(pos.y)) != 
ColMap::OUTOFSCREEN)
+      if (world->get_colmap()->getpixel(int(pos.x), int(pos.y)) != 
GroundpieceData::GP_NOTHING
+         && world->get_colmap()->getpixel(int(pos.x), int(pos.y)) !=  
GroundpieceData::GP_OUTOFSCREEN)
        {
          splash = true;
        }

Index: snow_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/snow_particle.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snow_particle.cxx   21 Jun 2002 07:45:36 -0000      1.3
+++ snow_particle.cxx   25 Jun 2002 18:15:18 -0000      1.4
@@ -116,8 +116,8 @@
 
   int pixel = world->get_colmap()->getpixel(int(pos.x), int(pos.y));
 
-  if (pixel != ColMap::NOTHING && pixel != ColMap::LAVA
-      && pixel != ColMap::WATER && pixel != ColMap::OUTOFSCREEN)
+  if (pixel != GroundpieceData::GP_NOTHING && pixel !=  
GroundpieceData::GP_WATER
+      && pixel != GroundpieceData::GP_OUTOFSCREEN)
     {
       //std::cout << "Snow: touch down: " << x_pos << " " << y_pos << 
std::endl;
       world->get_gfx_map()->put(ground_snow,