projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Comment out resizable flag because it blue-screens on Windows
[supertux.git]
/
src
/
object
/
star.cpp
diff --git
a/src/object/star.cpp
b/src/object/star.cpp
index
87e2c11
..
0af8d6f
100644
(file)
--- a/
src/object/star.cpp
+++ b/
src/object/star.cpp
@@
-31,10
+31,9
@@
static const float SPEED = 150;
static const float JUMPSPEED = -300;
Star::Star(const Vector& pos, Direction direction)
static const float JUMPSPEED = -300;
Star::Star(const Vector& pos, Direction direction)
- : MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
+
: MovingSprite(pos, "images/powerups/star/star.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
{
{
- physic.vx = ((direction == LEFT) ? -SPEED : SPEED);
- physic.vy = INITIALJUMP;
+ physic.set_velocity((direction == LEFT) ? -SPEED : SPEED, INITIALJUMP);
}
void
}
void
@@
-47,11
+46,11
@@
void
Star::collision_solid(const CollisionHit& hit)
{
if(hit.bottom) {
Star::collision_solid(const CollisionHit& hit)
{
if(hit.bottom) {
- physic.
vy = JUMPSPEED
;
+ physic.
set_velocity_y(JUMPSPEED)
;
} else if(hit.top) {
} else if(hit.top) {
- physic.
vy = 0
;
+ physic.
set_velocity_y(0)
;
} else if(hit.left || hit.right) {
} else if(hit.left || hit.right) {
- physic.
vx = -physic.vx
;
+ physic.
set_velocity_x(-physic.get_velocity_x())
;
}
}
}
}