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 e37ac6d..5830d2b 100644 (file)
--- a/src/badguy/plant.cpp
+++ b/src/badguy/plant.cpp
@@ -1,7 +1,7 @@
-//  $Id: plant.cpp 2979 2006-01-10 00:00:04Z matzebraun $
-// 
+//  $Id$
+//
 //  SuperTux
-//  Copyright (C) 2005 Matthias Braun <matze@braunis.de>
+//  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
@@ -12,11 +12,10 @@
 //  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
-//  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>
 
@@ -26,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;
 }
 
@@ -56,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
@@ -75,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());
@@ -84,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);