Make player liquid speed independent of FPS (#7543)

Make player liquid speed independent of FPS.
Fix codestyle issues in code block.

diff --git a/src/clientenvironment.cpp b/src/clientenvironment.cpp
index 53e3f783a0acbb9b5238c9d4b2594d232b13a698..a81d0dd8f4a89fc12a0bc8b1be7aa92dc37f2e31 100644 (file)
--- a/src/clientenvironment.cpp
+++ b/src/clientenvironment.cpp
@@ -165,31 +165,32 @@ void ClientEnvironment::step(float dtime)
 
                {
                        // Apply physics
-                       if(!free_move && !is_climbing)
-                       {
+                       if (!free_move && !is_climbing) {
                                // Gravity
                                v3f speed = lplayer->getSpeed();
-                               if(!lplayer->in_liquid)
-                                       speed.Y -= lplayer->movement_gravity * lplayer->physics_override_gravity * dtime_part * 2;
+                               if (!lplayer->in_liquid)
+                                       speed.Y -= lplayer->movement_gravity *
+                                               lplayer->physics_override_gravity * dtime_part * 2.0f;
 
                                // Liquid floating / sinking
-                               if(lplayer->in_liquid && !lplayer->swimming_vertical)
-                                       speed.Y -= lplayer->movement_liquid_sink * dtime_part * 2;
+                               if (lplayer->in_liquid && !lplayer->swimming_vertical)
+                                       speed.Y -= lplayer->movement_liquid_sink * dtime_part * 2.0f;
 
                                // Liquid resistance
-                               if(lplayer->in_liquid_stable || lplayer->in_liquid)
-                               {
-                                       // How much the node's viscosity blocks movement, ranges between 0 and 1
-                                       // Should match the scale at which viscosity increase affects other liquid attributes
-                                       const f32 viscosity_factor = 0.3;
+                               if (lplayer->in_liquid_stable || lplayer->in_liquid) {
+                                       // How much the node's viscosity blocks movement, ranges
+                                       // between 0 and 1. Should match the scale at which viscosity
+                                       // increase affects other liquid attributes.
+                                       static const f32 viscosity_factor = 0.3f;
 
                                        v3f d_wanted = -speed / lplayer->movement_liquid_fluidity;
                                        f32 dl = d_wanted.getLength();
-                                       if(dl > lplayer->movement_liquid_fluidity_smooth)
+                                       if (dl > lplayer->movement_liquid_fluidity_smooth)
                                                dl = lplayer->movement_liquid_fluidity_smooth;
-                                       dl *= (lplayer->liquid_viscosity * viscosity_factor) + (1 - viscosity_factor);
 
-                                       v3f d = d_wanted.normalize() * dl;
+                                       dl *= (lplayer->liquid_viscosity * viscosity_factor) +
+                                               (1 - viscosity_factor);
+                                       v3f d = d_wanted.normalize() * (dl * dtime_part * 100.0f);
                                        speed += d;
                                }