marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix pump power consumption (#1309)

stable-6.1
Maikel de Vries 2015-05-13 21:18:15 +02:00
parent 71db4010da
commit b17d0bccb6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
View File

@ -333,16 +333,16 @@ private func PumpHeight2Power(int pump_height)
var max_power = 60; var max_power = 60;
// Calculate the used power in steps of ten, every 60 pixels represents ten units. // Calculate the used power in steps of ten, every 60 pixels represents ten units.
var used_power = pump_height / 60 * 10; var used_power = pump_height / 60 * 10;
// If the power is positive then add the minimum energy. // If the pump height is positive then add the minimum energy.
if (used_power > 0) if (pump_height >= 0)
used_power = Min(used_power + 10, max_power); used_power = Min(used_power + 10, max_power);
// Pumping power downwards never costs energy, but only brings something if offset is overcome. // Pumping power downwards never costs energy, but only brings something if offset is overcome.
else else
used_power = Min(used_power + power_offset - 10, 0); used_power = BoundBy(used_power + power_offset - 10, -max_power, 0);
return used_power; return used_power;
} }
/** Returns whether there is liquid at the source pipe to pump */ // Returns whether there is liquid at the source pipe to pump.
private func HasLiquidToPump() private func HasLiquidToPump()
{ {
// source // source