X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=33a1606462944111515ddcba59d47674867622e5;hb=7d24ccd38a1aa858e96b238027594d91081daaa1;hp=ab4fc4dc35bd1c4b18d200d4628e5ffe521588c3;hpb=0d9d5685bf4d2308364dcff501f188295b71891c;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index ab4fc4dc3..33a160646 100644
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -1,7 +1,7 @@
 //  $Id$
-// 
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,27 +12,23 @@
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  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.
+//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <config.h>
 
 #include "stalactite.hpp"
+#include "random_generator.hpp"
 
 static const int SHAKE_RANGE = 40;
 static const float SHAKE_TIME = .8;
 static const float SQUISH_TIME = 2;
 
 Stalactite::Stalactite(const lisp::Lisp& lisp)
+	: BadGuy(lisp, "images/creatures/stalactite/stalactite.sprite"), state(STALACTITE_HANGING)
 {
-  lisp.get("x", start_position.x);
-  lisp.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/stalactite/stalactite.sprite");
-  state = STALACTITE_HANGING;
   countMe = false;
 }
 
@@ -76,7 +72,7 @@ Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
   if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
     return FORCE_MOVE;
   
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.normal.y < .9) { // hit floor?
     state = STALACTITE_SQUISHED;
     set_group(COLGROUP_MOVING_ONLY_STATIC);
     physic.set_velocity_y(0);
@@ -92,7 +88,7 @@ HitResponse
 Stalactite::collision_player(Player& player, const CollisionHit& )
 {
   if(state != STALACTITE_SQUISHED) {
-    player.kill(Player::SHRINK);
+    player.kill(false);
   }
 
   return FORCE_MOVE;
@@ -110,7 +106,7 @@ Stalactite::draw(DrawingContext& context)
     return;
     
   if(state == STALACTITE_SHAKING) {
-    sprite->draw(context, get_pos() + Vector((rand() % 6)-3, 0), LAYER_OBJECTS);
+    sprite->draw(context, get_pos() + Vector(systemRandom.rand(-3,3), 0), LAYER_OBJECTS);
   } else {
     sprite->draw(context, get_pos(), LAYER_OBJECTS);
   }