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

Removed authors Ringwaul and ST-DDT from liquid container 

They were not involved in the current script
liquid_container
Mark 2016-03-03 17:07:37 +01:00
parent a7ed516c39
commit cbe8bbd8e8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
*
* Basic interface for anything that can contain liquids.
*
* Author: Ringwaul, ST-DDT, Marky
* Author: Marky
*/
@ -56,6 +56,8 @@ func RemoveLiquid(string liquid_name, int amount, object destination)
{
FatalError(Format("You can remove positive amounts of liquid only, got %d", amount));
}
amount = amount ?? GetLiquidAmount();
var removed = 0;
for (var liquid in GetLiquidContents())
@ -87,10 +89,16 @@ func PutLiquid(string liquid_name, int amount, object source)
{
FatalError(Format("You can insert positive amounts of liquid only, got %d", amount));
}
var before = GetLiquidAmount(liquid_name);
var type = Library_Liquid->GetLiquidID(liquid_name);
CreateContents(type, amount);
var liquid = CreateObject(type);
liquid->SetStackCount(amount);
liquid->Enter(this);
if (liquid && !(liquid->Contained())) liquid->RemoveObject();
//CreateContents(type, amount);
var after = GetLiquidAmount(liquid_name);
return after - before;
}