X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=dad7103b41fa762a6fb5a83a21225b491fe09b81;hb=13c84268f16872f9b442251c4175a3a1a7a7899a;hp=46d16f6e4e2008d8768e34065aaa712fa0828bba;hpb=714a30abd887def6331a193216387e66cbfbd1bb;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 46d16f6e4..dad7103b4 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -23,12 +23,12 @@
 #include "random_generator.hpp"
 
 static const int SHAKE_RANGE_X = 40;
-static const float SHAKE_TIME = .8;
+static const float SHAKE_TIME = .8f;
 static const float SQUISH_TIME = 2;
 static const float SHAKE_RANGE_Y = 400;
 
 Stalactite::Stalactite(const lisp::Lisp& lisp)
-	: BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING)
+        : BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1), state(STALACTITE_HANGING)
 {
   countMe = false;
 }
@@ -51,7 +51,7 @@ Stalactite::active_update(float elapsed_time)
       if(player->get_bbox().p2.x > bbox.p1.x - SHAKE_RANGE_X
           && player->get_bbox().p1.x < bbox.p2.x + SHAKE_RANGE_X
           && player->get_bbox().p2.y > bbox.p1.y
-	  && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) {
+          && player->get_bbox().p1.y < bbox.p2.y + SHAKE_RANGE_Y) {
         timer.start(SHAKE_TIME);
         state = STALACTITE_SHAKING;
       }
@@ -59,7 +59,7 @@ Stalactite::active_update(float elapsed_time)
   } else if(state == STALACTITE_SHAKING) {
     if(timer.check()) {
       state = STALACTITE_FALLING;
-      physic.gravity_enabled = true;
+      physic.enable_gravity(true);
     }
   } else if(state == STALACTITE_FALLING || state == STALACTITE_SQUISHED) {
     movement = physic.get_movement(elapsed_time);
@@ -72,7 +72,7 @@ void
 Stalactite::squish()
 {
   state = STALACTITE_SQUISHED;
-  set_group(COLGROUP_MOVING_ONLY_STATIC);
+  set_colgroup_active(COLGROUP_MOVING_ONLY_STATIC);
   sprite->set_action("squished");
   if(!timer.started())
     timer.start(SQUISH_TIME);
@@ -85,7 +85,7 @@ Stalactite::collision_solid(const CollisionHit& hit)
     if (hit.bottom) squish();
   }
   if(state == STALACTITE_SQUISHED) {
-    physic.vy = 0;
+    physic.set_velocity_y(0);
   }
 }
 
@@ -99,7 +99,7 @@ Stalactite::collision_player(Player& player)
   return FORCE_MOVE;
 }
 
-HitResponse 
+HitResponse
 Stalactite::collision_badguy(BadGuy& other, const CollisionHit& hit)
 {
   if (state == STALACTITE_SQUISHED) return FORCE_MOVE;
@@ -130,7 +130,7 @@ Stalactite::draw(DrawingContext& context)
   if(get_state() != STATE_ACTIVE)
     return;
 
-  
+
   if(state == STALACTITE_SQUISHED) {
     sprite->draw(context, get_pos(), LAYER_OBJECTS);
     return;