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

[torangan]

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

Modified Files:
        pingu_particle_holder.cxx pingu_particle_holder.hxx 
Log Message:
Fix for Bug 685 - Explosions should be more colorfull


Index: pingu_particle_holder.cxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle_holder.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_particle_holder.cxx   28 Dec 2002 16:10:18 -0000      1.1
+++ pingu_particle_holder.cxx   1 Jan 2003 20:57:26 -0000       1.2
@@ -30,6 +30,7 @@
 
 PinguParticleHolder::PinguParticle::PinguParticle (int x, int y)
   : livetime(50 + (rand() % 50)),
+    use_frame2((rand() % 5) == 0),
     pos(Vector(x, y)),
     velocity(Vector(frand() * 7 - 3.5, frand() * -7))
 {
@@ -37,7 +38,7 @@
 
 
 PinguParticleHolder::PinguParticleHolder ()
-  : surface(PingusResource::load_surface("Particles/particle", "pingus"))
+  : surface(PingusResource::load_surface("Particles/pingu_explo", "pingus"))
 {
 }
 
@@ -154,8 +155,8 @@
       // skip dead particles
       if (!it->livetime)
         continue;
-       
-      gc.draw(surface, it->pos);
+      
+      gc.draw(surface, it->pos, it->use_frame2);
     }
 }
 

Index: pingu_particle_holder.hxx
===================================================================
RCS file: 
/usr/local/cvsroot/Games/Pingus/src/particles/pingu_particle_holder.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pingu_particle_holder.hxx   28 Dec 2002 16:10:18 -0000      1.1
+++ pingu_particle_holder.hxx   1 Jan 2003 20:57:26 -0000       1.2
@@ -30,8 +30,8 @@
 class PinguParticleHolder : public WorldObj
 {
   struct PinguParticle {
-    int   livetime;    
-
+    int  livetime;
+    bool use_frame2;
     /// The current position of the particle
     Vector pos;