- sounds are on both channels
[supertux.git] / src / badguy / snail.cpp
index 528ed59..1efedc0 100644 (file)
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux - Badguy "Snail"
 //  Copyright (C) 2006 Christoph Sommer <christoph.sommer@2006.expires.deltadevelopment.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  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.
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "badguy/snail.hpp"
 
-#include <config.h>
+#include "audio/sound_manager.hpp"
+#include "object/player.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
 
-#include "snail.hpp"
-#include "object/block.hpp"
+#include <math.h>
 
 namespace {
-  const float KICKSPEED = 500;
-  const int MAXSQUISHES = 10;
-  const float KICKSPEED_Y = -500; /**< y-velocity gained when kicked */
+const float KICKSPEED = 500;
+const int MAXSQUISHES = 10;
+const float KICKSPEED_Y = -500; /**< y-velocity gained when kicked */
 }
 
-Snail::Snail(const lisp::Lisp& reader)
-  : WalkingBadguy(reader, "images/creatures/snail/snail.sprite", "left", "right"), state(STATE_NORMAL), squishcount(0)
+Snail::Snail(const Reader& reader) :
+  WalkingBadguy(reader, "images/creatures/snail/snail.sprite", "left", "right"), 
+  state(STATE_NORMAL), 
+  kicked_delay_timer(),
+  squishcount(0)
 {
   walk_speed = 80;
   max_drop_height = 600;
@@ -38,8 +42,11 @@ Snail::Snail(const lisp::Lisp& reader)
   sound_manager->preload("sounds/kick.wav");
 }
 
-Snail::Snail(const Vector& pos, Direction d)
-  : WalkingBadguy(pos, d, "images/creatures/snail/snail.sprite", "left", "right"), state(STATE_NORMAL), squishcount(0)
+Snail::Snail(const Vector& pos, Direction d) :
+  WalkingBadguy(pos, d, "images/creatures/snail/snail.sprite", "left", "right"), 
+  state(STATE_NORMAL), 
+  kicked_delay_timer(),
+  squishcount(0)
 {
   walk_speed = 80;
   max_drop_height = 600;
@@ -49,14 +56,6 @@ Snail::Snail(const Vector& pos, Direction d)
 }
 
 void
-Snail::write(lisp::Writer& writer)
-{
-  writer.start_list("snail");
-  WalkingBadguy::write(writer);
-  writer.end_list("snail");
-}
-
-void
 Snail::initialize()
 {
   WalkingBadguy::initialize();
@@ -76,21 +75,17 @@ void
 Snail::be_flat()
 {
   state = STATE_FLAT;
-  sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
-  sprite->set_fps(64);
+  sprite->set_action(dir == LEFT ? "flat-left" : "flat-right", 1);
 
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
-
-  flat_timer.start(4);
 }
 
 void
 Snail::be_kicked()
 {
   state = STATE_KICKED_DELAY;
-  sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
-  sprite->set_fps(64);
+  sprite->set_action(dir == LEFT ? "flat-left" : "flat-right", 1);
 
   physic.set_velocity_x(0);
   physic.set_velocity_y(0);
@@ -101,7 +96,7 @@ Snail::be_kicked()
 
 bool
 Snail::can_break(){
-    return state == STATE_KICKED;
+  return state == STATE_KICKED;
 }
 
 void
@@ -111,16 +106,12 @@ Snail::active_update(float elapsed_time)
 
     case STATE_NORMAL:
       WalkingBadguy::active_update(elapsed_time);
-      break;
+      return;
 
     case STATE_FLAT:
-      if (flat_timer.started()) {
-        sprite->set_fps(64 - 15 * flat_timer.get_timegone());
-      }
-      if (flat_timer.check()) {
+      if (sprite->animation_done()) {
         be_normal();
       }
-      BadGuy::active_update(elapsed_time);
       break;
 
     case STATE_KICKED_DELAY:
@@ -129,46 +120,26 @@ Snail::active_update(float elapsed_time)
         physic.set_velocity_y(KICKSPEED_Y);
         state = STATE_KICKED;
       }
-      BadGuy::active_update(elapsed_time);
       break;
 
     case STATE_KICKED:
       physic.set_velocity_x(physic.get_velocity_x() * pow(0.99, elapsed_time/0.02));
-      if (fabsf(physic.get_velocity_x()) < walk_speed) be_normal();
-      BadGuy::active_update(elapsed_time);
+      if (sprite->animation_done() || (fabsf(physic.get_velocity_x()) < walk_speed)) be_normal();
       break;
 
   }
+
+  BadGuy::active_update(elapsed_time);
 }
 
 void
 Snail::collision_solid(const CollisionHit& hit)
 {
-  update_on_ground_flag(hit);
-
   switch (state) {
     case STATE_NORMAL:
       WalkingBadguy::collision_solid(hit);
-      break;
-    case STATE_FLAT:
-      if(hit.top || hit.bottom) {
-        physic.set_velocity_y(0);
-      }
-      if(hit.left || hit.right) {
-      }
-      break;
-    case STATE_KICKED_DELAY:
-      if(hit.top || hit.bottom) {
-        physic.set_velocity_y(0);
-      }
-      if(hit.left || hit.right) {
-        physic.set_velocity_x(0);
-      }
-      break;
+      return;
     case STATE_KICKED:
-      if(hit.top || hit.bottom) {
-        physic.set_velocity_y(0);
-      }
       if(hit.left || hit.right) {
         sound_manager->play("sounds/iceblock_bump.wav", get_pos());
 
@@ -176,14 +147,20 @@ Snail::collision_solid(const CollisionHit& hit)
           dir = (dir == LEFT) ? RIGHT : LEFT;
           sprite->set_action(dir == LEFT ? "flat-left" : "flat-right");
 
-          physic.set_velocity_x(-physic.get_velocity_x()*0.75);
-          if (fabsf(physic.get_velocity_x()) < walk_speed) be_normal();
+          physic.set_velocity_x(-physic.get_velocity_x());
         }
-
+      }
+      /* fall-through */
+    case STATE_FLAT:
+    case STATE_KICKED_DELAY:
+      if(hit.top || hit.bottom) {
+        physic.set_velocity_y(0);
       }
       break;
   }
 
+  update_on_ground_flag(hit);
+
 }
 
 HitResponse
@@ -212,18 +189,18 @@ Snail::collision_squished(GameObject& object)
 
     case STATE_KICKED:
     case STATE_NORMAL:
-      {
-        Player* player = dynamic_cast<Player*>(&object);
-        squishcount++;
-        if ((squishcount >= MAXSQUISHES) || (player && player->does_buttjump)) {
-          kill_fall();
-          return true;
-        }
+    {
+      Player* player = dynamic_cast<Player*>(&object);
+      squishcount++;
+      if ((squishcount >= MAXSQUISHES) || (player && player->does_buttjump)) {
+        kill_fall();
+        return true;
       }
+    }
 
-      sound_manager->play("sounds/stomp.wav", get_pos());
-      be_flat();
-      break;
+    sound_manager->play("sounds/stomp.wav", get_pos());
+    be_flat();
+    break;
 
     case STATE_FLAT:
       sound_manager->play("sounds/kick.wav", get_pos());
@@ -248,4 +225,4 @@ Snail::collision_squished(GameObject& object)
   return true;
 }
 
-IMPLEMENT_FACTORY(Snail, "snail")
+/* EOF */