projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove draw_text from renderer.hpp and lightmap.hpp since text drawing is done in...
[supertux.git]
/
src
/
badguy
/
mrrocket.cpp
diff --git
a/src/badguy/mrrocket.cpp
b/src/badguy/mrrocket.cpp
index
7e90629
..
4ac7045
100644
(file)
--- a/
src/badguy/mrrocket.cpp
+++ b/
src/badguy/mrrocket.cpp
@@
-20,6
+20,7
@@
#include <config.h>
#include "mrrocket.hpp"
#include <config.h>
#include "mrrocket.hpp"
+#include "object/explosion.hpp"
static const float SPEED = 200;
static const float SPEED = 200;
@@
-47,8
+48,8
@@
MrRocket::write(lisp::Writer& writer)
void
MrRocket::activate()
{
void
MrRocket::activate()
{
- physic.
vx =
(dir == LEFT ? -SPEED : SPEED);
- physic.
gravity_enabled = false
;
+ physic.
set_velocity_x
(dir == LEFT ? -SPEED : SPEED);
+ physic.
enable_gravity(false)
;
sprite->set_action(dir == LEFT ? "left" : "right");
}
sprite->set_action(dir == LEFT ? "left" : "right");
}
@@
-56,7
+57,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()) {
@@
-78,11
+79,11
@@
void
MrRocket::collision_solid(const CollisionHit& hit)
{
if(hit.top || hit.bottom) {
MrRocket::collision_solid(const CollisionHit& hit)
{
if(hit.top || hit.bottom) {
- physic.
vy = 0
;
+ physic.
set_velocity_y(0)
;
} else if(hit.left || hit.right) {
sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
} else if(hit.left || hit.right) {
sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
- physic.
vx = 0
;
- collision_timer.start(0.2, true);
+ physic.
set_velocity_x(0)
;
+ collision_timer.start(0.2
f
, true);
}
}
}
}