projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Set 'licence' attribute on sound files
[supertux.git]
/
src
/
badguy
/
mrrocket.cpp
diff --git
a/src/badguy/mrrocket.cpp
b/src/badguy/mrrocket.cpp
index
3f6cc3b
..
58f4df1
100644
(file)
--- a/
src/badguy/mrrocket.cpp
+++ b/
src/badguy/mrrocket.cpp
@@
-21,15
+21,21
@@
#include "mrrocket.hpp"
#include "mrrocket.hpp"
+#include "object/explosion.hpp"
+#include "lisp/writer.hpp"
+#include "object_factory.hpp"
+#include "sector.hpp"
+#include "sprite/sprite.hpp"
+
static const float SPEED = 200;
MrRocket::MrRocket(const lisp::Lisp& reader)
static const float SPEED = 200;
MrRocket::MrRocket(const lisp::Lisp& reader)
- : BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
+
: BadGuy(reader, "images/creatures/mr_rocket/mr_rocket.sprite")
{
}
MrRocket::MrRocket(const Vector& pos, Direction d)
{
}
MrRocket::MrRocket(const Vector& pos, Direction d)
- : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
+
: BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
{
}
{
}
@@
-38,14
+44,14
@@
MrRocket::write(lisp::Writer& writer)
{
writer.start_list("mrrocket");
{
writer.start_list("mrrocket");
- writer.write
_float
("x", start_position.x);
- writer.write
_float
("y", start_position.y);
+ writer.write("x", start_position.x);
+ writer.write("y", start_position.y);
writer.end_list("mrrocket");
}
void
writer.end_list("mrrocket");
}
void
-MrRocket::
activat
e()
+MrRocket::
initializ
e()
{
physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
physic.enable_gravity(false);
{
physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
physic.enable_gravity(false);
@@
-56,7
+62,7
@@
void
MrRocket::active_update(float elapsed_time)
{
if (collision_timer.check()) {
MrRocket::active_update(float elapsed_time)
{
if (collision_timer.check()) {
- Sector::current()->add_object(new
RocketExplosion(get_pos(), dir
));
+ Sector::current()->add_object(new
Explosion(get_bbox().get_middle()
));
remove_me();
}
else if (!collision_timer.started()) {
remove_me();
}
else if (!collision_timer.started()) {
@@
-82,7
+88,7
@@
MrRocket::collision_solid(const CollisionHit& hit)
} else if(hit.left || hit.right) {
sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
physic.set_velocity_x(0);
} else if(hit.left || hit.right) {
sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
physic.set_velocity_x(0);
- collision_timer.start(0.2, true);
+ collision_timer.start(0.2
f
, true);
}
}
}
}