projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed flip level transformer
[supertux.git]
/
src
/
object
/
powerup.cpp
diff --git
a/src/object/powerup.cpp
b/src/object/powerup.cpp
index
5551e07
..
f274d48
100644
(file)
--- a/
src/object/powerup.cpp
+++ b/
src/object/powerup.cpp
@@
-19,34
+19,24
@@
#include <config.h>
#include <config.h>
+#include <stdexcept>
#include <math.h>
#include <math.h>
+#include <stdexcept>
#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);
- lisp.get("sprite", sprite_name);
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);
-
- set_group(COLGROUP_MOVING);
-}
-
-PowerUp::~PowerUp()
-{
- delete sprite;
}
HitResponse
}
HitResponse
@@
-96,11
+86,5
@@
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");