fix cr/lfs and remove trailing whitespaces...

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

diff --git a/src/badguy/fish.cpp b/src/badguy/fish.cpp
index 850d0a6..b603125 100644 (file)
--- a/src/badguy/fish.cpp
+++ b/src/badguy/fish.cpp
@@ -24,7 +24,7 @@
 #include "object/tilemap.hpp"
 #include "log.hpp"
 
-static const float FISH_JUMP_POWER = 600;
+static const float FISH_JUMP_POWER = -600;
 static const float FISH_WAIT_TIME = 1;
 
 Fish::Fish(const lisp::Lisp& reader)
@@ -50,10 +50,10 @@ Fish::write(lisp::Writer& writer)
   writer.end_list("fish");
 }
 
-HitResponse
-Fish::collision_solid(GameObject& , const CollisionHit& chit)
+void
+Fish::collision_solid(const CollisionHit& chit)
 {
-  return hit(chit);
+  hit(chit);
 }
 
 HitResponse
@@ -72,9 +72,9 @@ Fish::draw(DrawingContext& context)
 }
 
 HitResponse
-Fish::hit(const CollisionHit& chit)
+Fish::hit(const CollisionHit& hit)
 {
-  if(chit.normal.y < .5) { // hit ceiling
+  if(hit.top) {
     physic.set_velocity_y(0);
   }
 
@@ -84,7 +84,7 @@ Fish::hit(const CollisionHit& chit)
 void
 Fish::collision_tile(uint32_t tile_attributes)
 {
-  if ((tile_attributes & Tile::WATER) && (physic.get_velocity_y() <= 0)) {
+  if ((tile_attributes & Tile::WATER) && (physic.get_velocity_y() >= 0)) {
 
     // initialize stop position if uninitialized
     if (stop_y == 0) stop_y = get_pos().y + get_bbox().get_height();
@@ -107,10 +107,10 @@ Fish::active_update(float elapsed_time)
   if(waiting.check()) {
     jump();
   }
-  
+
   // set sprite
-  sprite->set_action(physic.get_velocity_y() > 0 ? "normal" : "down");
-  
+  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
   {