projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rolled back bomb to old behaviour, some bomb gfx tuning
[supertux.git]
/
src
/
badguy
/
angrystone.cpp
diff --git
a/src/badguy/angrystone.cpp
b/src/badguy/angrystone.cpp
index
010230c
..
d44f9d8
100644
(file)
--- a/
src/badguy/angrystone.cpp
+++ b/
src/badguy/angrystone.cpp
@@
-1,7
+1,7
@@
// $Id$
//
// AngryStone - A spiked block that charges towards the player
// $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
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-31,6
+31,10
@@
static const float RECOVER_TIME = .5;
AngryStone::AngryStone(const lisp::Lisp& reader)
: BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
{
AngryStone::AngryStone(const lisp::Lisp& reader)
: BadGuy(reader, "images/creatures/angrystone/angrystone.sprite"), state(IDLE)
{
+ physic.set_velocity_x(0);
+ physic.set_velocity_y(0);
+ physic.enable_gravity(true);
+ sprite->set_action("idle");
}
void
}
void
@@
-45,18
+49,13
@@
AngryStone::write(lisp::Writer& writer)
}
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);
state = IDLE;
sprite->set_action("idle");
physic.set_velocity_x(0);
@@
-65,8
+64,7
@@
AngryStone::collision_solid(GameObject& , const CollisionHit& hit)
oldWallDirection.x = attackDirection.x;
oldWallDirection.y = attackDirection.y;
}
oldWallDirection.x = attackDirection.x;
oldWallDirection.y = attackDirection.y;
}
-
- return CONTINUE;
+#endif
}
void
}
void
@@
-86,7
+84,7
@@
AngryStone::collision_badguy(BadGuy& badguy, const CollisionHit& )
return FORCE_MOVE;
}
return FORCE_MOVE;
}
-void
+void
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
AngryStone::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);