projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved powerups to separate .sprite files
[supertux.git]
/
src
/
object
/
flower.cpp
diff --git
a/src/object/flower.cpp
b/src/object/flower.cpp
index
0dbdd38
..
04623a9
100644
(file)
--- a/
src/object/flower.cpp
+++ b/
src/object/flower.cpp
@@
-34,9
+34,11
@@
Flower::Flower(Type _type)
bbox.set_size(32, 32);
if(_type == FIREFLOWER)
bbox.set_size(32, 32);
if(_type == FIREFLOWER)
- sprite = sprite_manager->create("
fireflower
");
+ sprite = sprite_manager->create("
images/powerups/fireflower/fireflower.sprite
");
else
else
- sprite = sprite_manager->create("iceflower");
+ sprite = sprite_manager->create("images/powerups/iceflower/iceflower.sprite");
+
+ set_group(COLGROUP_TOUCHABLE);
}
Flower::~Flower()
}
Flower::~Flower()
@@
-67,7
+69,7
@@
Flower::collision(GameObject& other, const CollisionHit& )
else
player->set_bonus(ICE_BONUS, true);
else
player->set_bonus(ICE_BONUS, true);
- sound_manager->play("sounds/fire-flower.
ogg
");
+ sound_manager->play("sounds/fire-flower.
wav
");
remove_me();
return ABORT_MOVE;
}
remove_me();
return ABORT_MOVE;
}