X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=3c63bea43c7fb564387bd329dcc5d69909820226;hb=fbbf4e7e6f3f9251826f0c68169d3f04bb67efa8;hp=60857fb3f5a20eb21905a47c6b8a656971f0d260;hpb=959f514b78262ae6b276821bc61864fa6967b97c;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 60857fb3f..3c63bea43 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,32 +12,27 @@
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <config.h>
+#include "badguy/stalactite.hpp"
 
-#include "stalactite.hpp"
-#include "random_generator.hpp"
+#include "math/random_generator.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.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)
+Stalactite::Stalactite(const Reader& lisp) :
+  BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite", LAYER_TILES - 1),
+  timer(),
+  state(STALACTITE_HANGING)
 {
   countMe = false;
-}
-
-void
-Stalactite::write(lisp::Writer& writer)
-{
-  writer.start_list("stalactite");
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-  writer.end_list("stalactite");
+  set_colgroup_active(COLGROUP_TOUCHABLE);
 }
 
 void
@@ -49,9 +42,9 @@ Stalactite::active_update(float elapsed_time)
     Player* player = this->get_nearest_player();
     if (player) {
       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.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) {
         timer.start(SHAKE_TIME);
         state = STALACTITE_SHAKING;
       }
@@ -60,6 +53,7 @@ Stalactite::active_update(float elapsed_time)
     if(timer.check()) {
       state = STALACTITE_FALLING;
       physic.enable_gravity(true);
+      set_colgroup_active(COLGROUP_MOVING);
     }
   } else if(state == STALACTITE_FALLING || state == STALACTITE_SQUISHED) {
     movement = physic.get_movement(elapsed_time);
@@ -72,7 +66,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);
@@ -90,7 +84,7 @@ Stalactite::collision_solid(const CollisionHit& hit)
 }
 
 HitResponse
-Stalactite::collision_player(Player& player)
+Stalactite::collision_player(Player& player, const CollisionHit& )
 {
   if(state != STALACTITE_SQUISHED) {
     player.kill(false);
@@ -99,15 +93,16 @@ 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;
-  if (state != STALACTITE_FALLING) return BadGuy::collision_badguy(other, hit);
 
   // ignore other Stalactites
   if (dynamic_cast<Stalactite*>(&other)) return FORCE_MOVE;
 
+  if (state != STALACTITE_FALLING) return BadGuy::collision_badguy(other, hit);
+
   if (other.is_freezable()) {
     other.freeze();
   } else {
@@ -130,7 +125,6 @@ Stalactite::draw(DrawingContext& context)
   if(get_state() != STATE_ACTIVE)
     return;
 
-  
   if(state == STALACTITE_SQUISHED) {
     sprite->draw(context, get_pos(), LAYER_OBJECTS);
     return;
@@ -150,4 +144,4 @@ Stalactite::deactivate()
     remove_me();
 }
 
-IMPLEMENT_FACTORY(Stalactite, "stalactite")
+/* EOF */