X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fbadguy%2Ffish.cpp;h=93898d476823c8ea8fc21e97971bd5febc0464aa;hb=7a6f00e27bdc0aac2107506c3b00cbf0bf1cccc5;hp=43ceb5e706d5890d3cd9403f0eb620045d28158c;hpb=714a30abd887def6331a193216387e66cbfbd1bb;p=supertux.git

diff --git a/src/badguy/fish.cpp b/src/badguy/fish.cpp
index 43ceb5e70..93898d476 100644
--- a/src/badguy/fish.cpp
+++ b/src/badguy/fish.cpp
@@ -30,13 +30,13 @@ 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)
 {
-  physic.gravity_enabled = true;
+  physic.enable_gravity(true);
 }
 
 Fish::Fish(const Vector& pos)
 	: BadGuy(pos, "images/creatures/fish/fish.sprite", LAYER_TILES-1), stop_y(0)
 {
-  physic.gravity_enabled = true;
+  physic.enable_gravity(true);
 }
 
 void
@@ -75,7 +75,7 @@ HitResponse
 Fish::hit(const CollisionHit& hit)
 {
   if(hit.top) {
-    physic.vy = 0;
+    physic.set_velocity_y(0);
   }
 
   return CONTINUE;
@@ -84,7 +84,7 @@ Fish::hit(const CollisionHit& hit)
 void
 Fish::collision_tile(uint32_t tile_attributes)
 {
-  if ((tile_attributes & Tile::WATER) && (physic.vy >= 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();
@@ -111,13 +111,13 @@ Fish::active_update(float elapsed_time)
 
   // set sprite
   if(!frozen)
-    sprite->set_action(physic.vy < 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
   {
-    physic.vy = 0;
-    physic.gravity_enabled = true;
+    physic.set_velocity_y(0);
+    physic.enable_gravity(true);
   }
 }
 
@@ -125,24 +125,24 @@ void
 Fish::start_waiting()
 {
   waiting.start(FISH_WAIT_TIME);
-  set_group(COLGROUP_DISABLED);
-  physic.gravity_enabled = false;
-  physic.vy = 0;
+  set_colgroup_active(COLGROUP_DISABLED);
+  physic.enable_gravity(false);
+  physic.set_velocity_y(0);
 }
 
 void
 Fish::jump()
 {
-  physic.vy = FISH_JUMP_POWER;
-  physic.gravity_enabled = true;
-  set_group(COLGROUP_MOVING);
+  physic.set_velocity_y(FISH_JUMP_POWER);
+  physic.enable_gravity(true);
+  set_colgroup_active(COLGROUP_MOVING);
 }
 
 void
 Fish::freeze()
 {
   BadGuy::freeze();
-  sprite->set_action(physic.vy < 0 ? "iced" : "iced-down");
+  sprite->set_action(physic.get_velocity_y() < 0 ? "iced" : "iced-down");
   waiting.stop();
 }