projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made buttjump a bit easier to perform
[supertux.git]
/
src
/
object
/
flower.cpp
diff --git
a/src/object/flower.cpp
b/src/object/flower.cpp
index
b5830e0
..
71cacf2
100644
(file)
--- a/
src/object/flower.cpp
+++ b/
src/object/flower.cpp
@@
-39,7
+39,7
@@
Flower::Flower(BonusType _type)
sound_manager->preload("sounds/fire-flower.wav");
}
else if(type == ICE_BONUS) {
sound_manager->preload("sounds/fire-flower.wav");
}
else if(type == ICE_BONUS) {
- sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+ sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
} else {
assert(false);
}
} else {
assert(false);
}
@@
-72,9
+72,8
@@
Flower::collision(GameObject& other, const CollisionHit& )
if(!player->add_bonus(type, true))
return FORCE_MOVE;
if(!player->add_bonus(type, true))
return FORCE_MOVE;
-
+
sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}
sound_manager->play("sounds/fire-flower.wav");
remove_me();
return ABORT_MOVE;
}
-