[Pingus-CVS] CVS: Games/Pingus/src/particles explosive_particle.cxx,1.5,1.6 explosive_particle.hxx,1.5,1.6 ground_particle.cxx,1.3,1.4 ground_particle.hxx,1.5,1.6 pingu_particle_holder.cxx,1.8,1.9 pingu_particle_holder.hxx,1.3,1.4 rain_particle_holder.cxx,1.5,1.6 rain_particle_holder.hxx,1.4,1.5 smoke_particle_holder.cxx,1.4,1.5 smoke_particle_holder.hxx,1.2,1.3 snow_particle_holder.cxx,1.6,1.7 snow_particle_holder.hxx,1.3,1.4

[torangan]

Update of /var/lib/cvs/Games/Pingus/src/particles
In directory dark:/tmp/cvs-serv20737/particles

Modified Files:
        explosive_particle.cxx explosive_particle.hxx 
        ground_particle.cxx ground_particle.hxx 
        pingu_particle_holder.cxx pingu_particle_holder.hxx 
        rain_particle_holder.cxx rain_particle_holder.hxx 
        smoke_particle_holder.cxx smoke_particle_holder.hxx 
        snow_particle_holder.cxx snow_particle_holder.hxx 
Log Message:
removed trailing whitespace


Index: explosive_particle.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/explosive_particle.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- explosive_particle.cxx      28 Dec 2002 16:10:18 -0000      1.5
+++ explosive_particle.cxx      19 Apr 2003 10:23:19 -0000      1.6
@@ -26,9 +26,9 @@
 
 ExplosiveParticle::ExplosiveParticle (int x, int y, float x_a, float y_a)
                                     : Particle (x, y, x_a, y_a),
-                                      alive (true) 
-{  
-//  sprite = Sprite (PingusResource::load_surface 
+                                      alive (true)
+{
+//  sprite = Sprite (PingusResource::load_surface
 //                ("Particles/explosive",
 //                 "pingus"));
 }
@@ -37,11 +37,11 @@
 {
 }
 
-void 
+void
 ExplosiveParticle::update (float delta)
 {
   Vector new_pos = pos + velocity * delta;
-  
+
   Vector incr = pos - new_pos;
   incr.normalize ();
 
@@ -52,8 +52,8 @@
     {
       pos -= incr;
 
-      if (   pos.x < 0 
-          || pos.y < 0 
+      if (   pos.x < 0
+          || pos.y < 0
          || pos.x + 1 > WorldObj::get_world()->get_width ()
          || pos.y + 1 > WorldObj::get_world()->get_height())
        {
@@ -70,7 +70,7 @@
   pos = new_pos;
 }
 
-void 
+void
 ExplosiveParticle::detonate ()
 {
   alive = false;
@@ -81,19 +81,19 @@
   WorldObj::get_world()->get_colmap()->remove(bomber_radius,
                              int(pos.x) - (bomber_radius.get_width()/2),
                              int(pos.y) - (bomber_radius.get_height()/2));
-  WorldObj::get_world()->get_gfx_map()->remove(bomber_radius, 
+  WorldObj::get_world()->get_gfx_map()->remove(bomber_radius,
                               int(pos.x) - (bomber_radius.get_width()/2),
                               int(pos.y) - (bomber_radius.get_height()/2));
 }
 
-//void 
+//void
 //ExplosiveParticle::draw_offset(int ofx, int ofy, float /*s*/)
 //{
 //  sprite.put_screen (int(pos.x + ofx), int(pos.y + ofy));
 //}
 
 
-bool 
+bool
 ExplosiveParticle::is_alive(void)
 {
   return alive;

Index: explosive_particle.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/explosive_particle.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- explosive_particle.hxx      28 Dec 2002 16:10:18 -0000      1.5
+++ explosive_particle.hxx      19 Apr 2003 10:23:19 -0000      1.6
@@ -1,5 +1,5 @@
 //  $Id$
-// 
+//
 //  Pingus - A free Lemmings clone
 //  Copyright (C) 2000 Ingo Ruhnke <address@hidden>
 //
@@ -12,7 +12,7 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -29,7 +29,7 @@
 private:
   //Sprite sprite;
   bool alive;
-  
+
 public:
   ExplosiveParticle (int x, int y, float x_a, float y_a);
   ~ExplosiveParticle ();
@@ -40,7 +40,7 @@
   ///
   bool is_alive(void);
   void detonate ();
-  
+
 private:
   ExplosiveParticle (const ExplosiveParticle&);
   ExplosiveParticle& operator= (const ExplosiveParticle&);

Index: ground_particle.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/ground_particle.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ground_particle.cxx 28 Dec 2002 16:10:18 -0000      1.3
+++ ground_particle.cxx 19 Apr 2003 10:23:19 -0000      1.4
@@ -48,7 +48,7 @@
 
   if (s == 1.0) {
     // FIXME: This segfaults from time to time, don't know why
-    surface.put_screen(static_cast<int>(pos.x + ofx - 16), 
+    surface.put_screen(static_cast<int>(pos.x + ofx - 16),
                        static_cast<int>(pos.y + ofy - 16),
                       3 - (livetime * 4 / time));
   } else {

Index: ground_particle.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/ground_particle.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ground_particle.hxx 28 Dec 2002 16:10:18 -0000      1.5
+++ ground_particle.hxx 19 Apr 2003 10:23:19 -0000      1.6
@@ -32,7 +32,7 @@
 
   void update(float delta);
   void draw_offset(int ofx, int ofy, float s);
-  
+
 private:
   GroundParticle (const GroundParticle&);
   GroundParticle& operator= (const GroundParticle&);

Index: pingu_particle_holder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/pingu_particle_holder.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pingu_particle_holder.cxx   25 Mar 2003 00:56:33 -0000      1.8
+++ pingu_particle_holder.cxx   19 Apr 2003 10:23:19 -0000      1.9
@@ -50,7 +50,7 @@
 PinguParticleHolder::add_particle (int x, int y)
 {
   int i = 0;
-  
+
   // fill gaps from dead entries
   for (std::vector<PinguParticle>::iterator it=particles.begin(); it != 
particles.end(); ++it)
     {
@@ -60,10 +60,10 @@
           ++i;
         }
     }
-  
+
   // allocate space for all remaining particles at once
   particles.reserve(particles.size() + 50 - i);
-    
+
   // create remaining entries
   for (; i < 50; ++i)
     particles.push_back(PinguParticle(x, y));
@@ -78,7 +78,7 @@
       // skip dead particles
       if (!it->livetime)
         continue;
-    
+
       float tmp_x_add = 0.0f;
       float tmp_y_add = 0.0f;
 
@@ -161,7 +161,7 @@
       // skip dead particles
       if (!it->livetime)
         continue;
-      
+
       gc.draw(surface, it->pos, it->use_frame2);
     }
 }

Index: pingu_particle_holder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/pingu_particle_holder.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pingu_particle_holder.hxx   25 Jan 2003 11:03:58 -0000      1.3
+++ pingu_particle_holder.hxx   19 Apr 2003 10:23:19 -0000      1.4
@@ -36,17 +36,17 @@
     bool use_frame2;
     /// The current position of the particle
     Vector pos;
-  
+
     /// The velocity of the particle
     Vector velocity;
-    
+
     PinguParticle (int x, int y);
   };
 
 private:
   CL_Surface surface;
   std::vector<PinguParticle> particles;
-  
+
 public:
   PinguParticleHolder ();
 

Index: rain_particle_holder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/rain_particle_holder.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- rain_particle_holder.cxx    25 Mar 2003 00:37:44 -0000      1.5
+++ rain_particle_holder.cxx    19 Apr 2003 10:23:19 -0000      1.6
@@ -53,7 +53,7 @@
         *it = RainParticle(x, y);
         return;
       }
-       
+
   // create new entry
   particles.push_back(RainParticle(x, y));
 }
@@ -67,7 +67,7 @@
       // skip dead particles
       if (!it->alive)
         continue;
-       
+
       if (it->splash)
        {
          if (it->splash_frame >= rain_splash.get_num_frames())
@@ -75,7 +75,7 @@
              it->alive = false;
              continue;
            }
-                 
+
            it->splash_frame += 10 * game_speed / 1000.0f;
            (it->splash_counter == 3) ? it->alive = false : 
++it->splash_counter;
        }
@@ -94,7 +94,7 @@
                  it->alive = false;
                  continue;
                }
-               
+
                it->pos.x -= 5  * it->pos.z;
                it->pos.y += 16 * it->pos.z;
            }

Index: rain_particle_holder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/rain_particle_holder.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- rain_particle_holder.hxx    25 Mar 2003 00:37:44 -0000      1.4
+++ rain_particle_holder.hxx    19 Apr 2003 10:23:19 -0000      1.5
@@ -32,7 +32,7 @@
 class RainParticleHolder : public WorldObj
 {
   struct RainParticle {
-    bool  alive;    
+    bool  alive;
     bool  splash;
     bool  use_rain2_surf;
     int   splash_counter;
@@ -50,7 +50,7 @@
   CL_Surface rain_splash;
 
   std::vector<RainParticle> particles;
-  
+
 public:
   RainParticleHolder ();
 

Index: smoke_particle_holder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/smoke_particle_holder.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- smoke_particle_holder.cxx   5 Mar 2003 15:29:47 -0000       1.4
+++ smoke_particle_holder.cxx   19 Apr 2003 10:23:19 -0000      1.5
@@ -50,7 +50,7 @@
         *it = SmokeParticle(x, y, vel_x, vel_y);
            return;
          }
-       
+
        // create new entry
   particles.push_back(SmokeParticle(x, y, vel_x, vel_y));
 }
@@ -67,7 +67,7 @@
 
       it->pos.x += it->velocity.x;
          it->pos.y += it->velocity.y;
-           
+
          --it->livetime;
     }
 }
@@ -80,7 +80,7 @@
     {
       if (!it->livetime)
         continue;
-    
+
       if (!it->use_surf2)
         gc.draw(surf1, it->pos);
          else

Index: smoke_particle_holder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/smoke_particle_holder.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- smoke_particle_holder.hxx   25 Jan 2003 11:03:58 -0000      1.2
+++ smoke_particle_holder.hxx   19 Apr 2003 10:23:19 -0000      1.3
@@ -46,7 +46,7 @@
   CL_Surface surf2;
 
   std::vector<SmokeParticle> particles;
-  
+
 public:
   SmokeParticleHolder ();
 

Index: snow_particle_holder.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/snow_particle_holder.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- snow_particle_holder.cxx    19 Feb 2003 09:50:36 -0000      1.6
+++ snow_particle_holder.cxx    19 Apr 2003 10:23:19 -0000      1.7
@@ -77,7 +77,7 @@
         *it = SnowParticle(x, y, colliding);
         return;
       }
-       
+
        // create new entry
   particles.push_back(SnowParticle(x, y, colliding));
 }
@@ -99,7 +99,7 @@
           it->alive = false;
          continue;
        }
-      
+
       it->velocity.x += (Math::frand() - 0.5f) / 10;
 
       if (it->colliding)

Index: snow_particle_holder.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/particles/snow_particle_holder.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- snow_particle_holder.hxx    25 Jan 2003 11:03:58 -0000      1.3
+++ snow_particle_holder.hxx    19 Apr 2003 10:23:19 -0000      1.4
@@ -55,7 +55,7 @@
   CL_Surface ground;
 
   std::vector<SnowParticle> particles;
-  
+
 public:
   SnowParticleHolder ();