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

Limit liquid input to the maximum available amount

master
Mark 2018-12-25 16:53:47 +01:00
parent 1c9164b4be
commit 3f2ee5080d
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,24 +116,26 @@ Inserts liquid into the container.
*/ */
public func PutLiquid(liquid_name, int amount, object source) public func PutLiquid(liquid_name, int amount, object source)
{ {
amount = amount ?? this->GetLiquidAmountRemaining(); amount = amount ?? this->GetLiquidAmountRemaining(liquid_name);
if (amount < 0) if (amount < 0)
{ {
FatalError(Format("You can insert positive amounts of liquid only, got %d", amount)); FatalError(Format("You can insert positive amounts of liquid only, got %d", amount));
} }
var type = GetLiquidDef(liquid_name); var type = GetLiquidDef(liquid_name);
// Do nothing?
var max = this->GetLiquidContainerMaxFillLevel(liquid_name); var max = this->GetLiquidContainerMaxFillLevel(liquid_name);
var before = GetLiquidAmount(liquid_name); var before = GetLiquidAmount(liquid_name);
if (max > 0 && before >= max) return 0; if (max > 0 && before >= max) return 0;
// Limit to the actual maximum
amount = Min(amount, max);
if (type) if (type)
{ {
var liquid = type->~CreateLiquid(amount); var liquid = type->~CreateLiquid(amount);
if (liquid) Collect(liquid, true); if (liquid) Collect(liquid, true);
// the check is necessary here, because the liquid may get removed if the barrel already // The check is necessary here, because the liquid may get removed if the barrel already
// has a stack inside // has a stack inside
if (liquid && !(liquid->Contained())) liquid->RemoveObject(); if (liquid && !(liquid->Contained())) liquid->RemoveObject();
} }
@ -149,12 +151,20 @@ public func AcceptsLiquid(liquid_name, int amount)
return IsLiquidContainerForMaterial(liquid_type) && amount <= this->GetLiquidContainerMaxFillLevel(liquid_name) - GetLiquidAmount(liquid_name); return IsLiquidContainerForMaterial(liquid_type) && amount <= this->GetLiquidContainerMaxFillLevel(liquid_name) - GetLiquidAmount(liquid_name);
} }
private func GetLiquidDef(liquid_name) func GetLiquidDef(liquid_name)
{ {
if (GetType(liquid_name) == C4V_String) if (GetType(liquid_name) == C4V_String)
{
return GetDefinition(liquid_name); return GetDefinition(liquid_name);
}
else if (GetType(liquid_name) == C4V_Def) else if (GetType(liquid_name) == C4V_Def)
{
return liquid_name; return liquid_name;
}
else if (GetType(liquid_name) == C4V_C4Object)
{
return liquid_name->GetID();
}
FatalError(Format("The first parameter of GetLiquidDef() must either be a string or definition. You passed %v.", liquid_name)); FatalError(Format("The first parameter of GetLiquidDef() must either be a string or definition. You passed %v.", liquid_name));
return nil; return nil;
} }