Removed trailing whitespace from all *.?pp files

[supertux.git] / src / object / unstable_tile.cpp

diff --git a/src/object/unstable_tile.cpp b/src/object/unstable_tile.cpp
index f83d716..50ba0c6 100644 (file)
--- a/src/object/unstable_tile.cpp
+++ b/src/object/unstable_tile.cpp
@@ -25,9 +25,10 @@
 #include "supertux/object_factory.hpp"
 
 UnstableTile::UnstableTile(const Reader& lisp) :
-  MovingSprite(lisp, LAYER_TILES, COLGROUP_STATIC), 
+  MovingSprite(lisp, LAYER_TILES, COLGROUP_STATIC),
   physic(),
-  state(STATE_NORMAL)
+  state(STATE_NORMAL),
+  slowfall_timer()
 {
   sprite->set_action("normal");
   physic.set_gravity_modifier (.98);
@@ -75,7 +76,27 @@ void UnstableTile::dissolve (void)
     this->set_action ("dissolve", /* loops = */ 1);
   }
   else {
-    fall_down ();
+    slow_fall ();
+  }
+}
+
+void UnstableTile::slow_fall (void)
+{
+  /* Only enter slow-fall if neither shake nor dissolve is available. */
+  if (state != STATE_NORMAL) {
+    this->fall_down ();
+    return;
+  }
+
+  if (sprite->has_action ("fall-down")) {
+    state = STATE_SLOWFALL;
+    this->set_action ("fall-down", /* loops = */ 1);
+    physic.set_gravity_modifier (.10);
+    physic.enable_gravity (true);
+    slowfall_timer = 0.5; /* Fall slowly for half a second. */
+  }
+  else {
+    remove_me ();
   }
 }
 
@@ -83,12 +104,14 @@ void UnstableTile::fall_down (void)
 {
   if ((state != STATE_NORMAL)
       && (state != STATE_SHAKE)
-      && (state != STATE_DISSOLVE))
+      && (state != STATE_DISSOLVE)
+      && (state != STATE_SLOWFALL))
     return;
 
   if (sprite->has_action ("fall-down")) {
     state = STATE_FALL;
     this->set_action ("fall-down", /* loops = */ 1);
+    physic.set_gravity_modifier (.98);
     physic.enable_gravity (true);
   }
   else {
@@ -117,6 +140,14 @@ UnstableTile::update(float elapsed_time)
       }
       break;
 
+    case STATE_SLOWFALL:
+      if (slowfall_timer >= elapsed_time)
+       slowfall_timer -= elapsed_time;
+      else /* Switch to normal falling procedure */
+       fall_down ();
+      movement = physic.get_movement (elapsed_time);
+      break;
+
     case STATE_FALL:
       if (sprite->animation_done())
         remove_me ();