projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More -Weffc++ cleanup
[supertux.git]
/
src
/
badguy
/
plant.cpp
diff --git
a/src/badguy/plant.cpp
b/src/badguy/plant.cpp
index
0f1cce4
..
2bf14ff
100644
(file)
--- a/
src/badguy/plant.cpp
+++ b/
src/badguy/plant.cpp
@@
-1,12
+1,10
@@
-// $Id$
-//
// SuperTux
// Copyright (C) 2006 Matthias Braun <matze@braunis.de>
//
// SuperTux
// Copyright (C) 2006 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
-//
as published by the Free Software Foundation; either version 2
-//
of the License, or
(at your option) any later version.
+// This program is free software
: you can redistribute it and/or modify
+//
it under the terms of the GNU General Public License as published by
+//
the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-14,38
+12,27
@@
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
-#include
<config.h>
+#include
"badguy/plant.hpp"
-#include "plant.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
static const float WALKSPEED = 80;
static const float WAKE_TIME = .5;
static const float WALKSPEED = 80;
static const float WAKE_TIME = .5;
-Plant::Plant(const lisp::Lisp& reader)
+Plant::Plant(const Reader& reader) :
+ BadGuy(reader, "images/creatures/plant/plant.sprite"),
+ timer(),
+ state()
{
{
- reader.get("x", start_position.x);
- reader.get("y", start_position.y);
- sprite = sprite_manager->create("images/creatures/plant/plant.sprite");
- bbox.set_size(sprite->get_current_hitbox_width(), sprite->get_current_hitbox_height());
state = PLANT_SLEEPING;
}
void
state = PLANT_SLEEPING;
}
void
-Plant::write(lisp::Writer& writer)
-{
- writer.start_list("plant");
-
- writer.write_float("x", start_position.x);
- writer.write_float("y", start_position.y);
-
- writer.end_list("plant");
-}
-
-void
-Plant::activate()
+Plant::initialize()
{
//FIXME: turns sspiky around for debugging
dir = dir == LEFT ? RIGHT : LEFT;
{
//FIXME: turns sspiky around for debugging
dir = dir == LEFT ? RIGHT : LEFT;
@@
-55,18
+42,16
@@
Plant::activate()
sprite->set_action(dir == LEFT ? "sleeping-left" : "sleeping-right");
}
sprite->set_action(dir == LEFT ? "sleeping-left" : "sleeping-right");
}
-HitResponse
-Plant::collision_solid(
GameObject& ,
const CollisionHit& hit)
+void
+Plant::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) {
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "left" : "right");
physic.set_velocity_x(-physic.get_velocity_x());
}
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "left" : "right");
physic.set_velocity_x(-physic.get_velocity_x());
}
-
- return CONTINUE;
}
HitResponse
}
HitResponse
@@
-74,7
+59,7
@@
Plant::collision_badguy(BadGuy& , const CollisionHit& hit)
{
if(state != PLANT_WALKING) return CONTINUE;
{
if(state != PLANT_WALKING) return CONTINUE;
- if(
fabsf(hit.normal.x) > .8) { // left or right
+ if(
hit.left || hit.right) {
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "left" : "right");
physic.set_velocity_x(-physic.get_velocity_x());
dir = dir == LEFT ? RIGHT : LEFT;
sprite->set_action(dir == LEFT ? "left" : "right");
physic.set_velocity_x(-physic.get_velocity_x());
@@
-83,7
+68,7
@@
Plant::collision_badguy(BadGuy& , const CollisionHit& hit)
return CONTINUE;
}
return CONTINUE;
}
-void
+void
Plant::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
Plant::active_update(float elapsed_time) {
BadGuy::active_update(elapsed_time);
@@
-119,4
+104,6
@@
Plant::active_update(float elapsed_time) {
}
}
-IMPLEMENT_FACTORY(Plant, "plant")
+IMPLEMENT_FACTORY(Plant, "plant");
+
+/* EOF */