projects
/
supertux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5e79b9d
)
Stone form is heavy enough to break through bricks
author
LMH
<lmh.0013@gmail.com>
Sat, 29 Nov 2014 21:52:35 +0000
(11:52 -1000)
committer
LMH
<lmh.0013@gmail.com>
Sat, 29 Nov 2014 21:52:35 +0000
(11:52 -1000)
src/object/brick.cpp
patch
|
blob
|
history
diff --git
a/src/object/brick.cpp
b/src/object/brick.cpp
index
ebee438
..
fc48dd5
100644
(file)
--- a/
src/object/brick.cpp
+++ b/
src/object/brick.cpp
@@
-53,6
+53,7
@@
Brick::collision(GameObject& other, const CollisionHit& hit_){
Player* player = dynamic_cast<Player*> (&other);
if (player) {
if (player->does_buttjump) try_break(player);
Player* player = dynamic_cast<Player*> (&other);
if (player) {
if (player->does_buttjump) try_break(player);
+ if (player->is_stone() && player->get_velocity().y >= 280) try_break(player); // stoneform breaks through bricks
}
BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
}
BadGuy* badguy = dynamic_cast<BadGuy*> (&other);
@@
-87,7
+88,7
@@
Brick::try_break(Player* player)
SoundManager::current()->play("sounds/brick.wav");
Sector* sector = Sector::current();
Player& player_one = *(sector->player);
SoundManager::current()->play("sounds/brick.wav");
Sector* sector = Sector::current();
Player& player_one = *(sector->player);
- if(coin_counter > 0) {
+ if(coin_counter > 0
&& !player->is_stone()
) {
sector->add_object(std::make_shared<BouncyCoin>(get_pos(), true));
coin_counter--;
player_one.get_status()->add_coins(1);
sector->add_object(std::make_shared<BouncyCoin>(get_pos(), true));
coin_counter--;
player_one.get_status()->add_coins(1);