Reduce liquid volume per turn by a factor of 6 #34234

ZhilkinSerg · 2019-09-25T23:09:09Z

Summary

SUMMARY: Bugfixes "Reduce liquid volume per turn by a factor of 6"

Purpose of change

Amount of liquid transferred per turn was not changed after we moved from 6 to 1 second turns.

Describe the solution

Reduced amount of liquid transferred per turn by a factor of 6.

KorGgenT · 2019-09-26T02:03:57Z

src/activity_handlers.cpp

@@ -1330,7 +1330,7 @@ void activity_handlers::fill_liquid_do_turn( player_activity *act, player *p )
                break;
        }

-        static const auto volume_per_turn = units::from_liter( 4 );
+        static const auto volume_per_turn = units::from_liter( 4 / 6 );


while you're at it, wanna remove that auto in favor of units::volume? also that's integer division.

src/activity_handlers.cpp

BevapDin · 2019-09-26T07:50:45Z

src/activity_handlers.cpp

-        static const auto volume_per_turn = units::from_liter( 4 );
-        const int charges_per_turn = std::max( 1, liquid.charges_per_volume( volume_per_turn ) );
-        liquid.charges = std::min( charges_per_turn, liquid.charges );
+        static const units::volume volume_per_second = units::from_liter( 4 / 6 );


You changed this to 1 liter per second. 4 / 6 is 1 in C++ (both operands are integers, so integer division is performed). If you wan't floating points, you have to explicitly make one operand a floating point value: ( 4. / 6 )

It's 0 actually.

Ahhh my brain, I should have noticed that but for some reason I thought it was ok because of the units interface.

Reduce liquid volume per turn by factor 6

f401f47

KorGgenT reviewed Sep 26, 2019

View reviewed changes