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

Liquid Container: Let liquid object handle removing liquids

liquid_container
Mark 2016-02-26 22:11:11 +01:00
parent 8a49ae10c0
commit af8e681ec8
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
planet/Objects.ocd/Libraries.ocd/LiquidControl.ocd/Liquid.ocd/Script.c
View File

@ -263,12 +263,6 @@ func RemoveLiquid(string liquid_name, int amount, object destination)
FatalError(Format("You can remove positive amounts of liquid only, got %d", amount));
}
if (Contained() && Contained()->~IsLiquidContainer())
{
return Contained()->RemoveLiquid(liquid_name, amount, destination);
}
// default parameters if nothing is provided: the current material and level
liquid_name = liquid_name ?? IsLiquid();
amount = amount ?? GetLiquidAmount();

19
planet/Objects.ocd/Libraries.ocd/LiquidControl.ocd/LiquidContainer.ocd/Script.c
View File

@ -205,17 +205,14 @@ func RemoveLiquid(string liquid_name, int amount, object destination)
FatalError(Format("You can remove positive amounts of liquid only, got %d", amount));
}
// default parameters if nothing is provided: the current material and level
liquid_name = liquid_name ?? GetLiquidType();
amount = amount ?? GetLiquidFillLevel();
//Wrong material?
if (!WildcardMatch(GetLiquidType(), liquid_name))
return [GetLiquidType(), 0];
amount = Min(amount, GetLiquidFillLevel());
ChangeLiquidFillLevel(-amount);
return [liquid_name, amount];
if (GetLiquidItem())
{
return GetLiquidItem()->RemoveLiquid(liquid_name, amount, destination);
}
else
{
return [nil, 0];
}
}
/**