Colors patch from qmax ( + added stat_hdr_color into levelintro.hpp...)

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

diff --git a/src/badguy/fish.cpp b/src/badguy/fish.cpp
index 8035120..e83fbd4 100644 (file)
--- a/src/badguy/fish.cpp
+++ b/src/badguy/fish.cpp
@@ -28,13 +28,13 @@ 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)
+  : BadGuy(reader, "images/creatures/fish/fish.sprite", LAYER_TILES-1), 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)
+  : BadGuy(pos, "images/creatures/fish/fish.sprite", LAYER_TILES-1), stop_y(0)
 {
   physic.enable_gravity(true);
 }
@@ -68,7 +68,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
@@ -125,7 +131,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);
 }
@@ -135,7 +141,7 @@ Fish::jump()
 {
   physic.set_velocity_y(FISH_JUMP_POWER);
   physic.enable_gravity(true);
-  set_group(COLGROUP_MOVING);
+  set_colgroup_active(COLGROUP_MOVING);
 }
 
 void