pingus-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: grumbel
Subject: [Pingus-CVS] CVS: Games/Pingus/src/particles rain_particle.cxx,1.3,1.4 snow_particle.cxx,1.5,1.6
Date: 16 Sep 2002 20:31:11 -0000

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

Modified Files:
        rain_particle.cxx snow_particle.cxx 
Log Message:
- some groundpiece splitting/moving

Index: rain_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/rain_particle.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rain_particle.cxx   4 Sep 2002 14:55:12 -0000       1.3
+++ rain_particle.cxx   16 Sep 2002 20:31:09 -0000      1.4
@@ -98,8 +98,8 @@
     }
   else
     {
-      if (WorldObj::get_world()->get_colmap()->getpixel(int(pos.x), 
int(pos.y)) != GroundpieceData::GP_NOTHING
-         && WorldObj::get_world()->get_colmap()->getpixel(int(pos.x), 
int(pos.y)) !=  GroundpieceData::GP_OUTOFSCREEN)
+      if (WorldObj::get_world()->get_colmap()->getpixel(int(pos.x), 
int(pos.y)) != Groundtype::GP_NOTHING
+         && WorldObj::get_world()->get_colmap()->getpixel(int(pos.x), 
int(pos.y)) !=  Groundtype::GP_OUTOFSCREEN)
        {
          splash = true;
        }

Index: snow_particle.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/particles/snow_particle.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- snow_particle.cxx   4 Sep 2002 14:55:12 -0000       1.5
+++ snow_particle.cxx   16 Sep 2002 20:31:09 -0000      1.6
@@ -116,8 +116,8 @@
 
   int pixel = WorldObj::get_world()->get_colmap()->getpixel(int(pos.x), 
int(pos.y));
 
-  if (pixel != GroundpieceData::GP_NOTHING && pixel !=  
GroundpieceData::GP_WATER
-      && pixel != GroundpieceData::GP_OUTOFSCREEN)
+  if (pixel != Groundtype::GP_NOTHING && pixel !=  Groundtype::GP_WATER
+      && pixel != Groundtype::GP_OUTOFSCREEN)
     {
       //std::cout << "Snow: touch down: " << x_pos << " " << y_pos << 
std::endl;
       WorldObj::get_world()->get_gfx_map()->put(ground_snow,





reply via email to

[Prev in Thread] Current Thread [Next in Thread]