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
/
plant.cpp
diff --git
a/src/badguy/plant.cpp
b/src/badguy/plant.cpp
index
0f1cce4
..
5830d2b
100644
(file)
--- a/
src/badguy/plant.cpp
+++ b/
src/badguy/plant.cpp
@@
-25,11
+25,8
@@
static const float WALKSPEED = 80;
static const float WAKE_TIME = .5;
Plant::Plant(const lisp::Lisp& reader)
static const float WAKE_TIME = .5;
Plant::Plant(const lisp::Lisp& reader)
+ : BadGuy(reader, "images/creatures/plant/plant.sprite")
{
{
- 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;
}
state = PLANT_SLEEPING;
}
@@
-55,18
+52,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
+69,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
+78,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);