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
/
powerup.cpp
diff --git
a/src/object/powerup.cpp
b/src/object/powerup.cpp
index
4e14f93
..
429e284
100644
(file)
--- a/
src/object/powerup.cpp
+++ b/
src/object/powerup.cpp
@@
-25,70
+25,63
@@
#include "powerup.hpp"
#include "resources.hpp"
#include "player.hpp"
#include "powerup.hpp"
#include "resources.hpp"
#include "player.hpp"
-#include "sprite/sprite_manager.hpp"
#include "audio/sound_manager.hpp"
#include "object_factory.hpp"
#include "sector.hpp"
#include "log.hpp"
PowerUp::PowerUp(const lisp::Lisp& lisp)
#include "audio/sound_manager.hpp"
#include "object_factory.hpp"
#include "sector.hpp"
#include "log.hpp"
PowerUp::PowerUp(const lisp::Lisp& lisp)
+ : MovingSprite(lisp, LAYER_OBJECTS, COLGROUP_MOVING)
{
{
- lisp.get("x", bbox.p1.x);
- lisp.get("y", bbox.p1.y);
- if (!lisp.get("sprite", sprite_name))
- throw std::runtime_error("no sprite file set for powerup");
lisp.get("script", script);
no_physics = false;
lisp.get("disable-physics", no_physics);
lisp.get("script", script);
no_physics = false;
lisp.get("disable-physics", no_physics);
- bbox.set_size(32, 32);
- sprite = sprite_manager->create(sprite_name);
physic.enable_gravity(true);
physic.enable_gravity(true);
-
- s
et_group(COLGROUP_MOVING
);
+ sound_manager->preload("sounds/grow.ogg");
+ s
ound_manager->preload("sounds/fire-flower.wav"
);
}
}
-PowerUp::~PowerUp()
+void
+PowerUp::collision_solid(const CollisionHit& hit)
{
{
- delete sprite;
+ if(hit.bottom) {
+ physic.set_velocity_y(0);
+ }
+ if(hit.right || hit.left) {
+ physic.set_velocity_x(-physic.get_velocity_x());
+ }
}
HitResponse
}
HitResponse
-PowerUp::collision(GameObject& other, const CollisionHit&
hit
)
+PowerUp::collision(GameObject& other, const CollisionHit&)
{
{
- if(other.get_flags() & FLAG_SOLID) {
- if(fabsf(hit.normal.y) > .5) { // roof or ground
- physic.set_velocity_y(0);
- } else { // bumped left or right
- physic.set_velocity_x(-physic.get_velocity_x());
- }
-
- return CONTINUE;
- }
-
Player* player = dynamic_cast<Player*>(&other);
if(player == 0)
return FORCE_MOVE;
Player* player = dynamic_cast<Player*>(&other);
if(player == 0)
return FORCE_MOVE;
- remove_me();
-
if (script != "") {
std::istringstream stream(script);
Sector::current()->run_script(stream, "powerup-script");
if (script != "") {
std::istringstream stream(script);
Sector::current()->run_script(stream, "powerup-script");
+ remove_me();
return ABORT_MOVE;
}
// some defaults if no script has been set
if (sprite_name == "images/powerups/egg/egg.sprite") {
return ABORT_MOVE;
}
// some defaults if no script has been set
if (sprite_name == "images/powerups/egg/egg.sprite") {
- player->add_bonus(GROWUP_BONUS, true);
- sound_manager->play("sounds/grow.wav");
+ if(!player->add_bonus(GROWUP_BONUS, true))
+ return FORCE_MOVE;
+ sound_manager->play("sounds/grow.ogg");
} else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
} else if (sprite_name == "images/powerups/fireflower/fireflower.sprite") {
- player->add_bonus(FIRE_BONUS, true);
+ if(!player->add_bonus(FIRE_BONUS, true))
+ return FORCE_MOVE;
sound_manager->play("sounds/fire-flower.wav");
} else if (sprite_name == "images/powerups/star/star.sprite") {
player->make_invincible();
} else if (sprite_name == "images/powerups/1up/1up.sprite") {
player->get_status()->add_coins(100);
}
sound_manager->play("sounds/fire-flower.wav");
} else if (sprite_name == "images/powerups/star/star.sprite") {
player->make_invincible();
} else if (sprite_name == "images/powerups/1up/1up.sprite") {
player->get_status()->add_coins(100);
}
+
+ remove_me();
return ABORT_MOVE;
}
return ABORT_MOVE;
}
@@
-99,11
+92,4
@@
PowerUp::update(float elapsed_time)
movement = physic.get_movement(elapsed_time);
}
movement = physic.get_movement(elapsed_time);
}
-void
-PowerUp::draw(DrawingContext& context)
-{
- sprite->draw(context, get_pos(), LAYER_OBJECTS);
-}
-
IMPLEMENT_FACTORY(PowerUp, "powerup");
IMPLEMENT_FACTORY(PowerUp, "powerup");
-