-// $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
// 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.
-
-#include <config.h>
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include "stalactite.hpp"
+#include "badguy/stalactite.hpp"
-#include "random_generator.hpp"
-#include "lisp/writer.hpp"
-#include "object_factory.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 = .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("x", start_position.x);
- writer.write("y", start_position.y);
- writer.end_list("stalactite");
+ set_colgroup_active(COLGROUP_TOUCHABLE);
}
void
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;
}
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);
}
HitResponse
-Stalactite::collision_player(Player& player)
+Stalactite::collision_player(Player& player, const CollisionHit& )
{
if(state != STALACTITE_SQUISHED) {
player.kill(false);
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 {
if(get_state() != STATE_ACTIVE)
return;
-
if(state == STALACTITE_SQUISHED) {
sprite->draw(context, get_pos(), LAYER_OBJECTS);
return;
remove_me();
}
-IMPLEMENT_FACTORY(Stalactite, "stalactite")
+IMPLEMENT_FACTORY(Stalactite, "stalactite");
+
+/* EOF */