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
0a77d7f
..
4ac7045
100644
(file)
--- a/
src/badguy/mrrocket.cpp
+++ b/
src/badguy/mrrocket.cpp
@@
-1,7
+1,7
@@
// $Id$
// $Id$
-//
+//
// SuperTux
// SuperTux
-// Copyright (C) 200
5
Matthias Braun <matze@braunis.de>
+// Copyright (C) 200
6
Matthias Braun <matze@braunis.de>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@
-12,35
+12,26
@@
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
-//
+//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <config.h>
#include <config.h>
-#include "mrrocket.h"
+#include "mrrocket.hpp"
+#include "object/explosion.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")
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("mrrocket");
- set_direction = false;
}
}
-MrRocket::MrRocket(float pos_x, float pos_y, Direction d)
+MrRocket::MrRocket(const Vector& pos, Direction d)
+ : BadGuy(pos, d, "images/creatures/mr_rocket/mr_rocket.sprite")
{
{
- start_position.x = pos_x;
- start_position.y = pos_y;
- bbox.set_size(31.8, 31.8);
- sprite = sprite_manager->create("mrrocket");
- set_direction = true;
- initial_direction = d;
}
void
}
void
@@
-57,7
+48,6
@@
MrRocket::write(lisp::Writer& writer)
void
MrRocket::activate()
{
void
MrRocket::activate()
{
- if (set_direction) {dir = initial_direction;}
physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
physic.enable_gravity(false);
sprite->set_action(dir == LEFT ? "left" : "right");
physic.set_velocity_x(dir == LEFT ? -SPEED : SPEED);
physic.enable_gravity(false);
sprite->set_action(dir == LEFT ? "left" : "right");
@@
-67,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()) {
@@
-77,26
+67,24
@@
MrRocket::active_update(float elapsed_time)
}
bool
}
bool
-MrRocket::collision_squished(
Player& player
)
+MrRocket::collision_squished(
GameObject& object
)
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
{
sprite->set_action(dir == LEFT ? "squished-left" : "squished-right");
- kill_squished(
player
);
+ kill_squished(
object
);
kill_fall();
return true;
}
kill_fall();
return true;
}
-HitResponse
-MrRocket::collision_solid(
GameObject& ,
const CollisionHit& hit)
+void
+MrRocket::collision_solid(const CollisionHit& hit)
{
{
- if(
fabsf(hit.normal.y) > .5) { // hit floor or roof?
+ if(
hit.top || hit.bottom) {
physic.set_velocity_y(0);
physic.set_velocity_y(0);
- } else
{ // hit right or left
+ } else
if(hit.left || hit.right) {
sprite->set_action(dir == LEFT ? "collision-left" : "collision-right");
physic.set_velocity_x(0);
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);
}
}
-
- return CONTINUE;
}
IMPLEMENT_FACTORY(MrRocket, "mrrocket")
}
IMPLEMENT_FACTORY(MrRocket, "mrrocket")