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
/
bullet.cpp
diff --git
a/src/object/bullet.cpp
b/src/object/bullet.cpp
index
564b7ba
..
30e6dfa
100644
(file)
--- a/
src/object/bullet.cpp
+++ b/
src/object/bullet.cpp
@@
-44,6
+44,10
@@
Bullet::Bullet(const Vector& pos, float xm, int dir, BonusType type)
} else if(type == ICE_BONUS) {
life_count = 10;
sprite.reset(sprite_manager->create("images/objects/bullets/icebullet.sprite"));
} else if(type == ICE_BONUS) {
life_count = 10;
sprite.reset(sprite_manager->create("images/objects/bullets/icebullet.sprite"));
+ } else {
+ log_warning << "Bullet::Bullet called with unknown BonusType" << std::endl;
+ life_count = 10;
+ sprite.reset(sprite_manager->create("images/objects/bullets/firebullet.sprite"));
}
bbox.set_pos(pos);
}
bbox.set_pos(pos);
@@
-95,7
+99,7
@@
Bullet::collision_solid(const CollisionHit& hit)
}
}
}
}
-void
+void
Bullet::ricochet(GameObject& , const CollisionHit& hit)
{
collision_solid(hit);
Bullet::ricochet(GameObject& , const CollisionHit& hit)
{
collision_solid(hit);