projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed jump behaviour: Tux will now jump even if the button was pressed (up to)...
[supertux.git]
/
src
/
object
/
invisible_block.cpp
diff --git
a/src/object/invisible_block.cpp
b/src/object/invisible_block.cpp
index
2e802fc
..
96be2e6
100644
(file)
--- a/
src/object/invisible_block.cpp
+++ b/
src/object/invisible_block.cpp
@@
-33,7
+33,6
@@
InvisibleBlock::InvisibleBlock(const Vector& pos)
{
bbox.set_pos(pos);
sound_manager->preload("sounds/brick.wav");
{
bbox.set_pos(pos);
sound_manager->preload("sounds/brick.wav");
- sound_manager->preload("sounds/brick.wav");
}
void
}
void
@@
-67,7
+66,7
@@
InvisibleBlock::collision(GameObject& other, const CollisionHit& hit)
}
void
}
void
-InvisibleBlock::hit(Player& )
+InvisibleBlock::hit(Player&
player
)
{
sound_manager->play("sounds/brick.wav");
{
sound_manager->play("sounds/brick.wav");
@@
-75,7
+74,7
@@
InvisibleBlock::hit(Player& )
return;
sprite->set_action("empty");
return;
sprite->set_action("empty");
- start_bounce();
+ start_bounce(
&player
);
set_group(COLGROUP_STATIC);
visible = true;
}
set_group(COLGROUP_STATIC);
visible = true;
}