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

Power: Fixed unit test 21

liquid_container
Mark 2016-03-25 16:24:43 +01:00
parent c0b783c976
commit a34eea41dc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,19 +96,20 @@ func PutLiquid(string liquid_name, int amount, object source)
}
var before = GetLiquidAmount(liquid_name);
var type = Library_Liquid->GetLiquidID(liquid_name);
if (before >= this->GetLiquidContainerMaxFillLevel()) return 0;
var type = Library_Liquid->GetLiquidID(liquid_name);
var liquid = CreateObject(type);
if (liquid)
{
liquid->SetStackCount(amount);
liquid->Enter(this);
Collect(liquid, true);
// the check is necessary here, because the liquid may get removed if the barrel already
// has a stack inside
if (liquid && !(liquid->Contained())) liquid->RemoveObject();
}
//CreateContents(type, amount);
var after = GetLiquidAmount(liquid_name);
return after - before;
}