fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index da8db48..c81ea1d 100644 (file)
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -1,7 +1,7 @@
-//  $Id: sspiky.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,106 +12,98 @@
 //  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>
 
 #include "sspiky.hpp"
 
 static const float WALKSPEED = 80;
-static const float WAKE_TIME = .5;
 
 SSpiky::SSpiky(const lisp::Lisp& reader)
+       : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
 {
-  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/sspiky/sspiky.sprite");
-  state = SSPIKY_SLEEPING;
+  walk_speed = WALKSPEED;
+  max_drop_height = -1;
 }
 
 void
 SSpiky::write(lisp::Writer& writer)
 {
   writer.start_list("sspiky");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
+  WalkingBadguy::write(writer);
   writer.end_list("sspiky");
 }
 
 void
 SSpiky::activate()
 {
-  //FIXME: turns sspiky around for debugging
-  dir = dir == LEFT ? RIGHT : LEFT;
-
   state = SSPIKY_SLEEPING;
   physic.set_velocity_x(0);
   sprite->set_action(dir == LEFT ? "sleeping-left" : "sleeping-right");
 }
 
-HitResponse
-SSpiky::collision_solid(GameObject& , const CollisionHit& hit)
+void
+SSpiky::collision_solid(const CollisionHit& hit)
 {
-  if(fabsf(hit.normal.y) > .5) { // hit floor or roof?
-    physic.set_velocity_y(0);
-  } else { // hit right or left
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
+  if(state != SSPIKY_WALKING) {
+    BadGuy::collision_solid(hit);
+    return;
   }
-
-  return CONTINUE;
+  WalkingBadguy::collision_solid(hit);
 }
 
 HitResponse
-SSpiky::collision_badguy(BadGuy& , const CollisionHit& hit)
+SSpiky::collision_badguy(BadGuy& badguy, const CollisionHit& hit)
 {
-  if(state != SSPIKY_WALKING) return CONTINUE;
-
-  if(fabsf(hit.normal.x) > .8) { // left or right
-    dir = dir == LEFT ? RIGHT : LEFT;
-    sprite->set_action(dir == LEFT ? "left" : "right");
-    physic.set_velocity_x(-physic.get_velocity_x());
+  if(state != SSPIKY_WALKING) {
+    return BadGuy::collision_badguy(badguy, hit);
   }
-
-  return CONTINUE;
+  return WalkingBadguy::collision_badguy(badguy, hit);
 }
 
-void 
+void
 SSpiky::active_update(float elapsed_time) {
-  BadGuy::active_update(elapsed_time);
+
+  if(state == SSPIKY_WALKING) {
+    WalkingBadguy::active_update(elapsed_time);
+    return;
+  }
 
   if(state == SSPIKY_SLEEPING) {
-    const Vector playerPos = Sector::current()->player->get_pos();
-    const Vector myPos = this->get_pos();
-    float dx = (playerPos.x - myPos.x);
-    float dy = (playerPos.y - myPos.y);
-
-    // if we "see" the player
-    if ((((dir == LEFT) && (dx > -128) && (dx < 0)) || ((dir == RIGHT) && (dx > 0) && (dx < 128))) && (dy > -32) && (dy < 32)) {
-      // wake up
-      sprite->set_action(dir == LEFT ? "waking-left" : "waking-right");
-      if(!timer.started()) timer.start(WAKE_TIME);
-      state = SSPIKY_WAKING;
+
+    Player* player = this->get_nearest_player();
+    if (player) {
+      Rect mb = this->get_bbox();
+      Rect pb = player->get_bbox();
+
+      bool inReach_left = (pb.p2.x >= mb.p2.x-((dir == LEFT) ? 256 : 0));
+      bool inReach_right = (pb.p1.x <= mb.p1.x+((dir == RIGHT) ? 256 : 0));
+      bool inReach_top = (pb.p2.y >= mb.p1.y);
+      bool inReach_bottom = (pb.p1.y <= mb.p2.y);
+
+      if (inReach_left && inReach_right && inReach_top && inReach_bottom) {
+        // wake up
+        sprite->set_action(dir == LEFT ? "waking-left" : "waking-right", 1);
+        state = SSPIKY_WAKING;
+      }
     }
+
+    BadGuy::active_update(elapsed_time);
   }
 
   if(state == SSPIKY_WAKING) {
-    if(timer.check()) {
+    if(sprite->animation_done()) {
       // start walking
-      sprite->set_action(dir == LEFT ? "left" : "right");
-      physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED);
       state = SSPIKY_WALKING;
+      WalkingBadguy::activate();
     }
-  }
 
+    BadGuy::active_update(elapsed_time);
+  }
 }
 
 IMPLEMENT_FACTORY(SSpiky, "sspiky")