Applied sound pre-loading patch from mathnerd314 (#331)

[supertux.git] / src / badguy / plant.cpp

diff --git a/src/badguy/plant.cpp b/src/badguy/plant.cpp
index d452008..27db59b 100644 (file)
--- a/src/badguy/plant.cpp
+++ b/src/badguy/plant.cpp
@@ -42,7 +42,7 @@ Plant::write(lisp::Writer& writer)
 }
 
 void
-Plant::activate()
+Plant::initialize()
 {
   //FIXME: turns sspiky around for debugging
   dir = dir == LEFT ? RIGHT : LEFT;
@@ -52,18 +52,16 @@ Plant::activate()
   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);
-  } 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());
   }
-
-  return CONTINUE;
 }
 
 HitResponse
@@ -71,7 +69,7 @@ Plant::collision_badguy(BadGuy& , const CollisionHit& hit)
 {
   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());
@@ -80,7 +78,7 @@ Plant::collision_badguy(BadGuy& , const CollisionHit& hit)
   return CONTINUE;
 }
 
-void 
+void
 Plant::active_update(float elapsed_time) {
   BadGuy::active_update(elapsed_time);