projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SDL: Implement lightmaps smaller than the screen size. LIGHTMAP_DIV is calculated...
[supertux.git]
/
src
/
object
/
growup.cpp
diff --git
a/src/object/growup.cpp
b/src/object/growup.cpp
index
3a32bcf
..
1d256db
100644
(file)
--- a/
src/object/growup.cpp
+++ b/
src/object/growup.cpp
@@
-27,11
+27,11
@@
#include "player.hpp"
#include "audio/sound_manager.hpp"
#include "player.hpp"
#include "audio/sound_manager.hpp"
-GrowUp::GrowUp()
+GrowUp::GrowUp(
Direction direction
)
: MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
{
physic.enable_gravity(true);
: MovingSprite(Vector(0,0), "images/powerups/egg/egg.sprite", LAYER_OBJECTS, COLGROUP_MOVING)
{
physic.enable_gravity(true);
- physic.set_velocity_x(100);
+ physic.set_velocity_x(
(direction == LEFT)?-100:
100);
sound_manager->preload("sounds/grow.wav");
}
sound_manager->preload("sounds/grow.wav");
}
@@
-60,10
+60,9
@@
GrowUp::collision(GameObject& other, const CollisionHit& )
sound_manager->play("sounds/grow.wav");
remove_me();
sound_manager->play("sounds/grow.wav");
remove_me();
-
+
return ABORT_MOVE;
}
return FORCE_MOVE;
}
return ABORT_MOVE;
}
return FORCE_MOVE;
}
-