X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Fplant.cpp;h=5830d2b01c996d69b0eec20ebc63bed443253d4c;hb=c655b296af60a436a8ce2bf0e6ede4f72eae0580;hp=95fb00857566b4faedf965097d906a1f87fe63a1;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git

diff --git a/src/badguy/plant.cpp b/src/badguy/plant.cpp
index 95fb00857..5830d2b01 100644
--- 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)
+	: BadGuy(reader, "images/creatures/plant/plant.sprite")
 {
-  reader.get("x", start_position.x);
-  reader.get("y", start_position.y);
-  bbox.set_size(31.8, 31.8);
-  sprite = sprite_manager->create("images/creatures/plant/plant.sprite");
   state = PLANT_SLEEPING;
 }
 
@@ -55,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
@@ -74,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());
@@ -83,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);