X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fbadguy%2Ffish.cpp;h=c8bf8093b5d658862ca601d8b56e3bc986f0fb1a;hb=ee561bc97596929602f7ac055cd7e883a344f11c;hp=b60312509934627ae45ef9e143ec72cf4b5b519f;hpb=a113d3bd1feddd510e3b2852b0d42522735eee40;p=supertux.git

diff --git a/src/badguy/fish.cpp b/src/badguy/fish.cpp
index b60312509..c8bf8093b 100644
--- a/src/badguy/fish.cpp
+++ b/src/badguy/fish.cpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  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
-//  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
@@ -14,43 +12,34 @@
 //  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 <config.h>
+#include "badguy/fish.hpp"
 
-#include "fish.hpp"
-#include "tile.hpp"
-#include "object/tilemap.hpp"
-#include "log.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/tile.hpp"
 
 static const float FISH_JUMP_POWER = -600;
 static const float FISH_WAIT_TIME = 1;
 
-Fish::Fish(const lisp::Lisp& reader)
-	: BadGuy(reader, "images/creatures/fish/fish.sprite", LAYER_TILES-1), stop_y(0)
+Fish::Fish(const Reader& reader) :
+  BadGuy(reader, "images/creatures/fish/fish.sprite", LAYER_TILES-1), 
+  waiting(),
+  stop_y(0)
 {
   physic.enable_gravity(true);
 }
 
-Fish::Fish(const Vector& pos)
-	: BadGuy(pos, "images/creatures/fish/fish.sprite", LAYER_TILES-1), stop_y(0)
+Fish::Fish(const Vector& pos) :
+  BadGuy(pos, "images/creatures/fish/fish.sprite", LAYER_TILES-1), 
+  waiting(),
+  stop_y(0)
 {
   physic.enable_gravity(true);
 }
 
 void
-Fish::write(lisp::Writer& writer)
-{
-  writer.start_list("fish");
-
-  writer.write_float("x", start_position.x);
-  writer.write_float("y", start_position.y);
-
-  writer.end_list("fish");
-}
-
-void
 Fish::collision_solid(const CollisionHit& chit)
 {
   hit(chit);
@@ -68,7 +57,13 @@ Fish::draw(DrawingContext& context)
   if(waiting.started())
     return;
 
-  BadGuy::draw(context);
+  if (get_state() == STATE_FALLING) {
+    sprite->set_action("down");
+    sprite->draw(context, get_pos(), layer);
+  }
+  else if (get_state() == STATE_ACTIVE) {
+    sprite->draw(context, get_pos(), layer);
+  }
 }
 
 HitResponse
@@ -91,7 +86,8 @@ Fish::collision_tile(uint32_t tile_attributes)
 
     // stop when we have reached the stop position
     if (get_pos().y >= stop_y) {
-      start_waiting();
+      if(!frozen)
+        start_waiting();
       movement = Vector(0, 0);
     }
 
@@ -109,7 +105,8 @@ Fish::active_update(float elapsed_time)
   }
 
   // set sprite
-  sprite->set_action(physic.get_velocity_y() < 0 ? "normal" : "down");
+  if(!frozen)
+    sprite->set_action(physic.get_velocity_y() < 0 ? "normal" : "down");
 
   // we can't afford flying out of the tilemap, 'cause the engine would remove us.
   if ((get_pos().y - 31.8) < 0) // too high, let us fall
@@ -123,7 +120,7 @@ void
 Fish::start_waiting()
 {
   waiting.start(FISH_WAIT_TIME);
-  set_group(COLGROUP_DISABLED);
+  set_colgroup_active(COLGROUP_DISABLED);
   physic.enable_gravity(false);
   physic.set_velocity_y(0);
 }
@@ -133,7 +130,28 @@ Fish::jump()
 {
   physic.set_velocity_y(FISH_JUMP_POWER);
   physic.enable_gravity(true);
-  set_group(COLGROUP_MOVING);
+  set_colgroup_active(COLGROUP_MOVING);
+}
+
+void
+Fish::freeze()
+{
+  BadGuy::freeze();
+  sprite->set_action(physic.get_velocity_y() < 0 ? "iced" : "iced-down");
+  waiting.stop();
+}
+
+void
+Fish::unfreeze()
+{ // does this happen at all? (or do fishes die when they fall frozen?)
+  BadGuy::unfreeze();
+  start_waiting();
+}
+
+bool
+Fish::is_freezable() const
+{
+  return true;
 }
 
-IMPLEMENT_FACTORY(Fish, "fish")
+/* EOF */