projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mr Bomb turns arround again when colliding with other badguys.
[supertux.git]
/
src
/
badguy
/
stalactite.cpp
diff --git
a/src/badguy/stalactite.cpp
b/src/badguy/stalactite.cpp
index
f53a944
..
289135b
100644
(file)
--- a/
src/badguy/stalactite.cpp
+++ b/
src/badguy/stalactite.cpp
@@
-68,13
+68,13
@@
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)
{
if(state != STALACTITE_FALLING && state != STALACTITE_SQUISHED)
- return
FORCE_MOVE
;
+ return;
- if(hit.
normal.y < .9
) { // hit floor?
+ if(hit.
bottom
) { // hit floor?
state = STALACTITE_SQUISHED;
set_group(COLGROUP_MOVING_ONLY_STATIC);
physic.set_velocity_y(0);
state = STALACTITE_SQUISHED;
set_group(COLGROUP_MOVING_ONLY_STATIC);
physic.set_velocity_y(0);
@@
-82,12
+82,10
@@
Stalactite::collision_solid(GameObject& , const CollisionHit& hit)
if(!timer.started())
timer.start(SQUISH_TIME);
}
if(!timer.started())
timer.start(SQUISH_TIME);
}
-
- return CONTINUE;
}
HitResponse
}
HitResponse
-Stalactite::collision_player(Player& player
, const CollisionHit&
)
+Stalactite::collision_player(Player& player)
{
if(state != STALACTITE_SQUISHED) {
player.kill(false);
{
if(state != STALACTITE_SQUISHED) {
player.kill(false);