X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fstalactite.cpp;h=289135b60a0f2e6184ad03780da430332daa61d9;hb=a3316d68ca17966517c3f7bb0c0cb2b7e612fd0a;hp=82d47f22e3ec9d8ca80d52bd46963c8339cc9343;hpb=0676f7c09ab0d99e5b6a3bf74b9e2b62aaa885d4;p=supertux.git

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 82d47f22e..289135b60 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,24 @@
 //  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.h"
+#include "stalactite.hpp"
+#include "random_generator.hpp"
 
-static const int SHAKE_RANGE = 40;
+static const int SHAKE_RANGE_X = 40;
 static const float SHAKE_TIME = .8;
 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"), 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("stalactite");
-  state = STALACTITE_HANGING;
   countMe = false;
 }
 
@@ -49,12 +46,15 @@ void
 Stalactite::active_update(float elapsed_time)
 {
   if(state == STALACTITE_HANGING) {
-    Player* player = Sector::current()->player;
-    if(player->get_bbox().p2.x > bbox.p1.x - SHAKE_RANGE
-        && player->get_bbox().p1.x < bbox.p2.x + SHAKE_RANGE
-        && player->get_bbox().p2.y > bbox.p1.y) {
-      timer.start(SHAKE_TIME);
-      state = STALACTITE_SHAKING;
+    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) {
+        timer.start(SHAKE_TIME);
+        state = STALACTITE_SHAKING;
+      }
     }
   } else if(state == STALACTITE_SHAKING) {
     if(timer.check()) {
@@ -68,28 +68,27 @@ Stalactite::active_update(float elapsed_time)
   }
 }
 
-HitResponse
-Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
+void
+Stalactite::collision_solid(const CollisionHit& hit)
 {
   if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
-    return FORCE_MOVE;
+    return;
   
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
+  if(hit.bottom) { // hit floor?
     state = STALACTITE_SQUISHED;
+    set_group(COLGROUP_MOVING_ONLY_STATIC);
     physic.set_velocity_y(0);
     sprite->set_action("squished");
     if(!timer.started())
       timer.start(SQUISH_TIME);
   }
-
-  return CONTINUE;
 }
 
 HitResponse
-Stalactite::collision_player(Player& player, const CollisionHit& )
+Stalactite::collision_player(Player& player)
 {
   if(state != STALACTITE_SQUISHED) {
-    player.kill(Player::SHRINK);
+    player.kill(false);
   }
 
   return FORCE_MOVE;
@@ -107,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);
   }