projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[cppcheck] Part 2: Some further style fixes etc.
[supertux.git]
/
src
/
object
/
oneup.cpp
diff --git
a/src/object/oneup.cpp
b/src/object/oneup.cpp
index
d48b58d
..
281aca7
100644
(file)
--- a/
src/object/oneup.cpp
+++ b/
src/object/oneup.cpp
@@
-19,9
+19,12
@@
#include "supertux/sector.hpp"
OneUp::OneUp(const Vector& pos, Direction direction) :
#include "supertux/sector.hpp"
OneUp::OneUp(const Vector& pos, Direction direction) :
- MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE)
+ MovingSprite(pos, "images/powerups/1up/1up.sprite", LAYER_FLOATINGOBJECTS, COLGROUP_TOUCHABLE),
+ physic()
{
physic.set_velocity((direction == LEFT)?-100:100, -400);
{
physic.set_velocity((direction == LEFT)?-100:100, -400);
+ if(direction == DOWN) // this causes the doll to drop when opened with a butt-jump
+ physic.set_velocity(0, -100);
}
void
}
void