[Pingus-CVS] CVS: Games/Pingus/src/actions angel.cxx,1.11,1.12 angel.hxx,1.11,1.12 basher.cxx,1.16,1.17 basher.hxx,1.11,1.12 blocker.cxx,1.11,1.12 blocker.hxx,1.11,1.12 boarder.cxx,1.10,1.11 boarder.hxx,1.10,1.11 bomber.cxx,1.14,1.15 bomber.hxx,1.12,1.13 bridger.cxx,1.19,1.20 bridger.hxx,1.14,1.15 climber.cxx,1.13,1.14 climber.hxx,1.10,1.11 digger.cxx,1.15,1.16 digger.hxx,1.9,1.10 drown.cxx,1.9,1.10 drown.hxx,1.9,1.10 exiter.cxx,1.9,1.10 exiter.hxx,1.9,1.10 faller.cxx,1.25,1.26 faller.hxx,1.14,1.15 floater.cxx,1.17,1.18 floater.hxx,1.11,1.12 jumper.cxx,1.13,1.14 jumper.hxx,1.9,1.10 laser_kill.cxx,1.10,1.11 laser_kill.hxx,1.10,1.11 miner.cxx,1.12,1.13 miner.hxx,1.9,1.10 rocket_launcher.cxx,1.9,1.10 rocket_launcher.hxx,1.9,1.10 slider.cxx,1.11,1.12 slider.hxx,1.9,1.10 smashed.cxx,1.9,1.10 smashed.hxx,1.10,1.11 splashed.cxx,1.9,1.10 splashed.hxx,1.10,1.11 superman.cxx,1.7,1.8 superman.hxx,1.10,1.11 teleported.cxx,1.8,1.9 teleported.hxx,1.9,1.10 waiter.cxx,1.9,1.10 waiter.hxx,1.9,1.10 walker.cxx,1.24,1.25 walker.hxx,1.9,1.10

[grumbel]

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

Modified Files:
        angel.cxx angel.hxx basher.cxx basher.hxx blocker.cxx 
        blocker.hxx boarder.cxx boarder.hxx bomber.cxx bomber.hxx 
        bridger.cxx bridger.hxx climber.cxx climber.hxx digger.cxx 
        digger.hxx drown.cxx drown.hxx exiter.cxx exiter.hxx 
        faller.cxx faller.hxx floater.cxx floater.hxx jumper.cxx 
        jumper.hxx laser_kill.cxx laser_kill.hxx miner.cxx miner.hxx 
        rocket_launcher.cxx rocket_launcher.hxx slider.cxx slider.hxx 
        smashed.cxx smashed.hxx splashed.cxx splashed.hxx superman.cxx 
        superman.hxx teleported.cxx teleported.hxx waiter.cxx 
        waiter.hxx walker.cxx walker.hxx 
Log Message:
- riped 'float delta' out of the engine code
- some worldmap stuff


Index: angel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/angel.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- angel.cxx   14 Sep 2002 19:06:33 -0000      1.11
+++ angel.cxx   1 Oct 2002 19:53:44 -0000       1.12
@@ -22,6 +22,7 @@
 #include "../pingu.hxx"
 #include "../pingus_resource.hxx"
 #include "../string_converter.hxx"
+#include "../globals.hxx"
 #include "angel.hxx"
 
 namespace Actions {
@@ -42,11 +43,11 @@
 }
 
 void  
-Angel::update (float delta)
+Angel::update ()
 {
-  sprite.update (delta);
-  counter += delta;
-  pingu->set_pos(x_pos + 20 * sin (counter * 3.0), pingu->get_y() - 50.0f * 
delta);
+  sprite.update ();
+  counter += game_speed;
+  pingu->set_pos(x_pos + 20 * sin (counter * 3.0), pingu->get_y() - 50.0f * 
0.025f);
 
   // Out of screen, let the pingu die
   if (pingu->get_y() < -32)

Index: angel.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/angel.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- angel.hxx   27 Sep 2002 11:26:44 -0000      1.11
+++ angel.hxx   1 Oct 2002 19:53:44 -0000       1.12
@@ -39,7 +39,7 @@
   std::string get_name () const { return "Angel"; }
   ActionName get_type () const { return Actions::Angel; }
     
-  void  update (float delta);
+  void  update ();
   void  draw (GraphicContext& gc);
 
 private:

Index: basher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/basher.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- basher.cxx  16 Sep 2002 20:31:09 -0000      1.16
+++ basher.cxx  1 Oct 2002 19:53:45 -0000       1.17
@@ -59,9 +59,9 @@
 }
 
 void
-Basher::update (float delta)
+Basher::update ()
 {
-  sprite.update (delta);
+  sprite.update ();
 
   ++basher_c;
   if (basher_c % 3 == 0)
@@ -114,14 +114,14 @@
       return true;
     }
 
-  for(int i = 0; i < 16; ++i)
+  for(int x = 0; x < 16; ++x)
     {
       // Check that there is a high enough wall (i.e. not 1 pixel) to bash.
       // Probably best to check from where Pingu can't automatically walk up
       // up to head collision height.
-      for (int j = bash_height + 1; j <= 26; ++j)
+      for (int y = bash_height + 1; y <= 26; ++y)
        {
-         if (rel_getpixel(i,j) == Groundtype::GP_GROUND)
+         if (rel_getpixel(x, y) == Groundtype::GP_GROUND)
            {
              pout(PINGUS_DEBUG_ACTIONS) << "Basher: Found something to dig..." 
<< std::endl;
              return true;

Index: basher.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/basher.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- basher.hxx  27 Sep 2002 11:26:44 -0000      1.11
+++ basher.hxx  1 Oct 2002 19:53:45 -0000       1.12
@@ -45,7 +45,7 @@
   ActionName get_type () const { return Actions::Basher; }
     
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
     
   bool have_something_to_dig ();
   void walk_forward ();

Index: blocker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/blocker.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blocker.cxx 18 Sep 2002 10:50:57 -0000      1.11
+++ blocker.cxx 1 Oct 2002 19:53:45 -0000       1.12
@@ -55,7 +55,7 @@
 }
 
 void
-Blocker::update(float delta)
+Blocker::update()
 {
   if (!standing_on_ground())
     {
@@ -69,8 +69,6 @@
          catch_pingu(*i);
        }
     }
-
-  UNUSED_ARG(delta);
 }
 
 void

Index: blocker.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/blocker.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- blocker.hxx 27 Sep 2002 11:26:44 -0000      1.11
+++ blocker.hxx 1 Oct 2002 19:53:45 -0000       1.12
@@ -40,7 +40,7 @@
   ActionName get_type() const { return Actions::Blocker; }
  
   void  draw (GraphicContext& gc);
-  void  update(float delta);
+  void  update();
 
 private:
   bool  standing_on_ground();

Index: boarder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/boarder.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- boarder.cxx 28 Sep 2002 11:52:23 -0000      1.10
+++ boarder.cxx 1 Oct 2002 19:53:45 -0000       1.11
@@ -42,18 +42,18 @@
 }
 
 void  
-Boarder::update(float delta)
+Boarder::update()
 {
   if (pingu->direction.is_left ())
     sprite.set_direction(Sprite::LEFT); 
   else
     sprite.set_direction(Sprite::RIGHT); 
-  sprite.update (delta);
+  sprite.update ();
 
   if (on_ground ())
     {
       if (speed < 15.0)
-       speed += 15.0 * delta;
+       speed += 15.0 * 25.0f/1000.0f;
       else {
        speed = 15.0;
       }

Index: boarder.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/boarder.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- boarder.hxx 27 Sep 2002 11:26:44 -0000      1.10
+++ boarder.hxx 1 Oct 2002 19:53:45 -0000       1.11
@@ -42,7 +42,7 @@
   ActionName get_type () const { return Actions::Boarder; }
   
   void  draw (GraphicContext& gc);
-  void  update (float delta);
+  void  update ();
   
 private:
   bool on_ground ();

Index: bomber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bomber.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bomber.cxx  28 Sep 2002 11:52:23 -0000      1.14
+++ bomber.cxx  1 Oct 2002 19:53:45 -0000       1.15
@@ -80,9 +80,9 @@
 }
 
 void
-Bomber::update (float delta)
+Bomber::update ()
 {
-  sprite.update (delta);
+  sprite.update ();
 
   if (sprite.get_frame () > 9 && !sound_played) {
     WorldObj::get_world()->play_wav("sounds/plop.wav", pingu->get_pos ());
@@ -123,13 +123,11 @@
 }
 
 void
-Bomber::update_position (float delta)
+Bomber::update_position ()
 {
   // Apply all forces
   pingu->set_velocity(ForcesHolder::apply_forces(pingu->get_pos(), 
pingu->get_velocity()));
   pingu->set_pos(pingu->get_pos() + pingu->get_velocity());
-  
-  UNUSED_ARG(delta);
 }
 
 } // namespace Actions

Index: bomber.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bomber.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bomber.hxx  27 Sep 2002 11:26:44 -0000      1.12
+++ bomber.hxx  1 Oct 2002 19:53:45 -0000       1.13
@@ -51,9 +51,9 @@
   ActionType get_activation_mode() const { return COUNTDOWN_TRIGGERED; }
 
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
 
-  void update_position(float delta);
+  void update_position();
   int  activation_time() { return 50; }
   void on_successfull_apply (Pingu*);
   

Index: bridger.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bridger.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- bridger.cxx 29 Sep 2002 20:45:31 -0000      1.19
+++ bridger.cxx 1 Oct 2002 19:53:45 -0000       1.20
@@ -107,22 +107,22 @@
 }
 
 void
-Bridger::update(float delta)
+Bridger::update()
 {
   switch (mode)
     {
     case B_BUILDING:
-      update_build (delta);
+      update_build ();
       break;
 
     case B_WALKING:
-      update_walk (delta);
+      update_walk ();
       break;
     }
 }
 
 void
-Bridger::update_walk (float delta)
+Bridger::update_walk ()
 {
   if (walk_sprite.finished ())
     {
@@ -142,14 +142,14 @@
     }
   else
     {
-      walk_sprite.update (delta);
+      walk_sprite.update ();
     }
 }
 
 void
-Bridger::update_build (float delta)
+Bridger::update_build ()
 {
-  build_sprite.update (delta);
+  build_sprite.update ();
 
   if (build_sprite.get_frame () >= 7 && !block_build)
     {

Index: bridger.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/bridger.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- bridger.hxx 28 Sep 2002 11:52:23 -0000      1.14
+++ bridger.hxx 1 Oct 2002 19:53:45 -0000       1.15
@@ -59,9 +59,9 @@
   std::string get_name () const;
   ActionName get_type () const { return Actions::Bridger; }
     
-  void   update (float delta);
-  void   update_build (float delta);
-  void   update_walk (float delta);
+  void   update ();
+  void   update_build ();
+  void   update_walk ();
     
   void   draw (GraphicContext& gc);
     

Index: climber.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/climber.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- climber.cxx 16 Sep 2002 23:06:01 -0000      1.13
+++ climber.cxx 1 Oct 2002 19:53:45 -0000       1.14
@@ -51,7 +51,7 @@
 }
 
 void
-Climber::update(float delta)
+Climber::update()
 {
   /*
     std::cout << "Climer update()" << std::endl;
@@ -61,7 +61,7 @@
     printf("%3d %3d %3d\n", rel_getpixel(1,-1), 
rel_getpixel(0,-1),rel_getpixel(-1, -1));
   */  
 
-  sprite.update(delta);
+  sprite.update();
 
   // If above is free
   if (rel_getpixel(0, 1) ==  Groundtype::GP_NOTHING
@@ -107,6 +107,12 @@
 Climber::draw (GraphicContext& gc)
 {
   gc.draw (sprite, pingu->get_pos());
+}
+
+bool
+Climber::change_allowed(ActionName new_action)
+{
+  return false;
 }
 
 } // namespace Actions

Index: climber.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/climber.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- climber.hxx 27 Sep 2002 11:26:44 -0000      1.10
+++ climber.hxx 1 Oct 2002 19:53:45 -0000       1.11
@@ -39,10 +39,11 @@
     
   void draw (GraphicContext& gc);
     
-  void update (float delta);
+  void update ();
     
   char get_persistent_char () { return 'c'; }
-  
+  bool change_allowed(ActionName new_action);
+
 private:
   Climber (const Climber&);
   Climber& operator= (const Climber&);

Index: digger.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/digger.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- digger.cxx  24 Sep 2002 17:02:48 -0000      1.15
+++ digger.cxx  1 Oct 2002 19:53:45 -0000       1.16
@@ -50,9 +50,9 @@
 }
 
 void
-Digger::update (float delta)
+Digger::update ()
 {
-  sprite.update (delta);
+  sprite.update ();
   
   if (++digger_c >= 5)
     {

Index: digger.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/digger.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- digger.hxx  27 Sep 2002 11:26:44 -0000      1.9
+++ digger.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -44,7 +44,7 @@
   void dig ();
     
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
 private:
   Digger (const Digger&);

Index: drown.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/drown.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- drown.cxx   28 Sep 2002 11:52:23 -0000      1.9
+++ drown.cxx   1 Oct 2002 19:53:45 -0000       1.10
@@ -50,9 +50,9 @@
 }
 
 void 
-Drown::update (float delta)
+Drown::update ()
 {
-  sprite.update(delta);
+  sprite.update();
   if (sprite.finished())
     {
       pingu->set_status(PS_DEAD);

Index: drown.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/drown.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- drown.hxx   27 Sep 2002 11:26:44 -0000      1.9
+++ drown.hxx   1 Oct 2002 19:53:45 -0000       1.10
@@ -38,7 +38,7 @@
   ActionName get_type () const { return Actions::Drown; }
     
   void draw (GraphicContext& gc);
-  void update (float delta);  
+  void update ();  
     
   bool catchable () { return false; }
   

Index: exiter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/exiter.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exiter.cxx  28 Sep 2002 11:52:23 -0000      1.9
+++ exiter.cxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -33,9 +33,9 @@
 }
 
 void
-Exiter::update (float delta)
+Exiter::update ()
 {
-  sprite.update(delta);
+  sprite.update();
 
   if (sprite.finished())
     {

Index: exiter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/exiter.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- exiter.hxx  27 Sep 2002 11:26:44 -0000      1.9
+++ exiter.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -37,7 +37,7 @@
   ActionName get_type() const { return Actions::Exiter; }
 
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
   
 private:
   Exiter (const Exiter&);

Index: faller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- faller.cxx  28 Sep 2002 11:52:23 -0000      1.25
+++ faller.cxx  1 Oct 2002 19:53:45 -0000       1.26
@@ -48,10 +48,10 @@
 }
 
 void
-Faller::update (float delta)
+Faller::update ()
 {
-  tumbler.update (delta);
-  faller.update (delta);
+  tumbler.update ();
+  faller.update ();
 
   // Pingu stands on ground
   if (rel_getpixel(0, -1) !=  Groundtype::GP_NOTHING)

Index: faller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.hxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- faller.hxx  27 Sep 2002 11:26:44 -0000      1.14
+++ faller.hxx  1 Oct 2002 19:53:45 -0000       1.15
@@ -42,7 +42,7 @@
   void  init(void);
   
   void  draw (GraphicContext& gc);
-  void  update(float delta);
+  void  update();
 
   bool change_allowed (Actions::ActionName new_action);
   

Index: floater.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/floater.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- floater.cxx 28 Sep 2002 11:52:23 -0000      1.17
+++ floater.cxx 1 Oct 2002 19:53:45 -0000       1.18
@@ -38,9 +38,9 @@
 }
 
 void
-Floater::update(float delta)
+Floater::update()
 {
-  sprite.update (delta);
+  sprite.update ();
 
   pingu->set_velocity(Vector(0.0, 0.0));
   if (rel_getpixel(0, -1) == Groundtype::GP_NOTHING) {

Index: floater.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/floater.hxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- floater.hxx 27 Sep 2002 11:26:44 -0000      1.11
+++ floater.hxx 1 Oct 2002 19:53:45 -0000       1.12
@@ -41,7 +41,7 @@
   void init(void);
 
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
 
   char get_persistent_char () { return 'f'; }
   bool change_allowed (ActionName new_action);

Index: jumper.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/jumper.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- jumper.cxx  28 Sep 2002 11:52:23 -0000      1.13
+++ jumper.cxx  1 Oct 2002 19:53:45 -0000       1.14
@@ -45,7 +45,7 @@
 }
 
 void
-Jumper::update (float delta)
+Jumper::update ()
 {
   //FIXME Vector
   Vector temp(pingu->get_velocity());
@@ -60,7 +60,6 @@
   pingu->set_y(pingu->get_y() - 1);
 
   pingu->set_action (Actions::Faller);
-  UNUSED_ARG(delta);
 }
 
 } // namespace Actions

Index: jumper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/jumper.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jumper.hxx  27 Sep 2002 11:26:44 -0000      1.9
+++ jumper.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -37,7 +37,7 @@
   ActionName get_type() const { return Actions::Jumper; }
 
   void  draw (GraphicContext& gc);
-  void  update(float delta);
+  void  update();
   
 private:
   Jumper (const Jumper&);

Index: laser_kill.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/laser_kill.cxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_kill.cxx      28 Sep 2002 11:52:23 -0000      1.10
+++ laser_kill.cxx      1 Oct 2002 19:53:45 -0000       1.11
@@ -48,12 +48,12 @@
 }
 
 void
-LaserKill::update (float delta)
+LaserKill::update ()
 {
   if (sprite.finished())
     pingu->set_status(PS_DEAD);
   else
-    sprite.update(delta);
+    sprite.update();
 }
 
 } // namespace Actions

Index: laser_kill.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/laser_kill.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- laser_kill.hxx      27 Sep 2002 11:26:44 -0000      1.10
+++ laser_kill.hxx      1 Oct 2002 19:53:45 -0000       1.11
@@ -39,7 +39,7 @@
   void init (void);
 
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
   bool catchable () { return false; }
   

Index: miner.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/miner.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- miner.cxx   16 Sep 2002 20:31:09 -0000      1.12
+++ miner.cxx   1 Oct 2002 19:53:45 -0000       1.13
@@ -43,9 +43,9 @@
   }
 
   void
-  Miner::update(float delta)
+  Miner::update()
   {
-    sprite.update (delta);
+    sprite.update ();
   
     // FIXME: Direction handling is ugly
     if (pingu->direction.is_left ())

Index: miner.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/miner.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- miner.hxx   27 Sep 2002 11:26:44 -0000      1.9
+++ miner.hxx   1 Oct 2002 19:53:45 -0000       1.10
@@ -41,7 +41,7 @@
   ActionName get_type () const { return Actions::Miner; }
 
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
   
 private:
   Miner (const Miner&);

Index: rocket_launcher.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/rocket_launcher.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rocket_launcher.cxx 14 Sep 2002 19:06:33 -0000      1.9
+++ rocket_launcher.cxx 1 Oct 2002 19:53:45 -0000       1.10
@@ -46,14 +46,14 @@
 }
 
 void
-RocketLauncher::update (float delta)
+RocketLauncher::update ()
 {
   if (sprite.finished())
     {
       pingu->set_action(Actions::Walker);
     }
 
-  sprite.update(delta);
+  sprite.update();
 }
 
 void

Index: rocket_launcher.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/rocket_launcher.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- rocket_launcher.hxx 27 Sep 2002 11:26:44 -0000      1.9
+++ rocket_launcher.hxx 1 Oct 2002 19:53:45 -0000       1.10
@@ -40,7 +40,7 @@
   ActionName get_type () const { return Actions::Rocketlauncher; }
   
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
   
 private:
   RocketLauncher (const RocketLauncher&);

Index: slider.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/slider.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- slider.cxx  28 Sep 2002 11:52:23 -0000      1.11
+++ slider.cxx  1 Oct 2002 19:53:45 -0000       1.12
@@ -39,14 +39,14 @@
 }
 
 void
-Slider::update (float delta)
+Slider::update ()
 {
   if (pingu->direction.is_left())
     sprite.set_direction(Sprite::LEFT);
   else
     sprite.set_direction(Sprite::RIGHT);
 
-  sprite.update (delta);
+  sprite.update ();
 
   for (int i = 0; i < speed; ++i)
     {
@@ -68,7 +68,7 @@
        }
     }
 
-  speed -= 7 * delta;
+  speed -= 7 * 0.025f;
   if (speed < 1)
     pingu->set_action(Actions::Walker);
 }

Index: slider.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/slider.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- slider.hxx  27 Sep 2002 11:26:45 -0000      1.9
+++ slider.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -38,7 +38,7 @@
   ActionName get_type() const { return Actions::Slider; }
 
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
   
 private:
   Slider (const Slider&);

Index: smashed.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/smashed.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- smashed.cxx 28 Sep 2002 11:52:23 -0000      1.9
+++ smashed.cxx 1 Oct 2002 19:53:45 -0000       1.10
@@ -39,9 +39,9 @@
 }
 
 void
-Smashed::update(float delta)
+Smashed::update()
 {
-  sprite.update(delta);
+  sprite.update();
   //  pingu->particle->add_pingu_explo(pingu->x_pos, pingu->y_pos - 16);
   if (sprite.finished())
     pingu->set_status(PS_DEAD);

Index: smashed.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/smashed.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- smashed.hxx 27 Sep 2002 11:26:45 -0000      1.10
+++ smashed.hxx 1 Oct 2002 19:53:45 -0000       1.11
@@ -41,7 +41,7 @@
   ActionName get_type () const { return Actions::Smashed; }
 
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
   bool catchable () { return false; }
   

Index: splashed.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/splashed.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- splashed.cxx        28 Sep 2002 11:52:23 -0000      1.9
+++ splashed.cxx        1 Oct 2002 19:53:45 -0000       1.10
@@ -42,9 +42,9 @@
 }
 
 void
-Splashed::update (float delta)
+Splashed::update ()
 {
-  sprite.update (delta);
+  sprite.update ();
 
   if (!particle_thrown)
     {

Index: splashed.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/splashed.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- splashed.hxx        27 Sep 2002 11:26:45 -0000      1.10
+++ splashed.hxx        1 Oct 2002 19:53:45 -0000       1.11
@@ -39,7 +39,7 @@
   ActionName get_type () const { return Actions::Splashed; }
   
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
   bool catchable () { return false; }
   bool change_allowed (Actions::ActionName) { return false; }

Index: superman.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/superman.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- superman.cxx        14 Sep 2002 19:06:33 -0000      1.7
+++ superman.cxx        1 Oct 2002 19:53:45 -0000       1.8
@@ -41,11 +41,11 @@
 }
 
 void  
-Superman::update (float delta)
+Superman::update ()
 {
-  sprite.update(delta);
-  counter += delta;
-  pingu->set_pos(pingu->get_x() + 40.0f * delta, pingu->get_y() - 200.0f * 
delta);
+  sprite.update();
+  counter += 0.025f;
+  pingu->set_pos(pingu->get_x() + 40.0f * 0.025f, pingu->get_y() - 200.0f * 
0.025f);
 
   if (pingu->get_y() < -32)
     pingu->set_status(PS_DEAD);

Index: superman.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/superman.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- superman.hxx        27 Sep 2002 11:26:45 -0000      1.10
+++ superman.hxx        1 Oct 2002 19:53:45 -0000       1.11
@@ -39,7 +39,7 @@
   ActionName get_type () const { return Actions::Superman; }
   
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
 private:
   Superman (const Superman&);

Index: teleported.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/teleported.cxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- teleported.cxx      14 Sep 2002 19:06:33 -0000      1.8
+++ teleported.cxx      1 Oct 2002 19:53:45 -0000       1.9
@@ -42,7 +42,7 @@
 
 
 void
-Teleported::update(float /*delta*/)
+Teleported::update()
 {
   pingu->set_pos (x_target, y_target);
   pingu->set_status(PS_ALIVE);

Index: teleported.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/teleported.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- teleported.hxx      27 Sep 2002 11:26:45 -0000      1.9
+++ teleported.hxx      1 Oct 2002 19:53:45 -0000       1.10
@@ -37,7 +37,7 @@
   void init(void);
 
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
 
   bool catchable () { return false; }
 

Index: waiter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/waiter.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- waiter.cxx  28 Sep 2002 11:52:23 -0000      1.9
+++ waiter.cxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -30,14 +30,14 @@
 }
 
 void
-Waiter::update (float delta)
+Waiter::update ()
 {
-  sprite.update(delta);
+  sprite.update();
   
   if (countdown < 0)
     pingu->set_action(Actions::Walker);
   
-  countdown -= delta;
+  countdown -= 0.025f;
 }
 
 void

Index: waiter.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/waiter.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- waiter.hxx  27 Sep 2002 11:26:45 -0000      1.9
+++ waiter.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -42,7 +42,7 @@
   ActionName get_type() const { return Actions::Waiter; }
   
   void draw (GraphicContext& gc);
-  void update(float delta);
+  void update();
   
 private:
   Waiter (const Waiter&);

Index: walker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- walker.cxx  28 Sep 2002 11:52:23 -0000      1.24
+++ walker.cxx  1 Oct 2002 19:53:45 -0000       1.25
@@ -38,10 +38,10 @@
 }
 
 void
-Walker::update (float delta)
+Walker::update ()
 {
   // update the sprite
-  walker.update(delta);
+  walker.update();
 
   Vector last_pos = pingu->get_pos();
 

Index: walker.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/walker.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- walker.hxx  27 Sep 2002 11:26:45 -0000      1.9
+++ walker.hxx  1 Oct 2002 19:53:45 -0000       1.10
@@ -37,7 +37,7 @@
   void init (void);
 
   void draw (GraphicContext& gc);
-  void update (float delta);
+  void update ();
 
   std::string get_name () const { return "Walker"; }
   ActionName get_type () const { return Actions::Walker; }