// $Id$
//
// AngryStone - A spiked block that charges towards the player
-// Copyright (C) 2006 Christoph Sommer <supertux@2006.expires.deltadevelopment.de>
+// Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
static const float RECOVER_TIME = .5;
AngryStone::AngryStone(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- sprite = sprite_manager->create("images/creatures/angrystone/angrystone.sprite");
- bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
- state = IDLE;
+ physic.set_velocity_x(0);
+ physic.set_velocity_y(0);
+ physic.enable_gravity(true);
+ sprite->set_action("idle");
}
void
}
void
-AngryStone::activate()
-{
- physic.set_velocity_x(0);
- physic.set_velocity_y(0);
- physic.enable_gravity(true);
- sprite->set_action("idle");
-}
-
-HitResponse
-AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
+AngryStone::collision_solid(const CollisionHit& hit)
{
- if ((state == ATTACKING) && (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
+ // TODO
+ (void) hit;
+#if 0
+ if ((state == ATTACKING) &&
+ (hit.normal.x == -attackDirection.x) && (hit.normal.y == attackDirection.y)) {
state = IDLE;
sprite->set_action("idle");
physic.set_velocity_x(0);
oldWallDirection.x = attackDirection.x;
oldWallDirection.y = attackDirection.y;
}
-
- return CONTINUE;
+#endif
}
void
return FORCE_MOVE;
}
-void
+void
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
if ((dx > -playerWidth) && (dx < badguyWidth)) {
if (dy > 0) {
attackDirection.x = 0;
- attackDirection.y = -1;
+ attackDirection.y = 1;
} else {
attackDirection.x = 0;
- attackDirection.y = 1;
+ attackDirection.y = -1;
}
if ((attackDirection.x != oldWallDirection.x) || (attackDirection.y != oldWallDirection.y)) {
sprite->set_action("charging");