[Pingus-CVS] CVS: Games/Pingus/src/actions faller.cxx,1.11,1.12 floater.hxx,1.4,1.5 walker.cxx,1.12,1.13

[grumbel]

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

Modified Files:
        faller.cxx floater.hxx walker.cxx 
Log Message:
fixed a few newly introduced action bugs and some cleanup

Index: faller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/faller.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- faller.cxx  28 Jun 2002 15:12:22 -0000      1.11
+++ faller.cxx  28 Jun 2002 18:11:10 -0000      1.12
@@ -63,7 +63,7 @@
 
   // FIXME: This should be triggered at a later point, when close to
   // FIXME: deadly_velocity or something like that
-  if (pingu->set_fall_action())
+  if (pingu->velocity.y > 5.0 && pingu->request_fall_action())
     return;
 
   // Apply all forces

Index: floater.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/floater.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- floater.hxx 28 Jun 2002 15:12:22 -0000      1.4
+++ floater.hxx 28 Jun 2002 18:11:10 -0000      1.5
@@ -36,7 +36,7 @@
 
   std::string get_name() const { return "Floater"; }
   ActionName get_type() const { return Pingus::Actions::Faller; }
-  ActionType get_activation_mode() { return FALL_TRIGGERED; };
+  ActionType get_activation_mode() const { return FALL_TRIGGERED; }
   void init(void);
   void update(float delta);
   void draw_offset (int x, int y, float s);

Index: walker.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/actions/walker.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- walker.cxx  28 Jun 2002 17:04:21 -0000      1.12
+++ walker.cxx  28 Jun 2002 18:11:10 -0000      1.13
@@ -143,7 +143,7 @@
          if (rel_getpixel(1, 0) !=  GroundpieceData::GP_NOTHING)
            {
              // We reached a wall
-              if (pingu->set_wall_action()) 
+              if (pingu->request_wall_action()) 
                 {
                  pout(PINGUS_DEBUG_ACTIONS) 
                    << "Pingu: We are in front of a wall, setting persistant 
action" << std::endl;