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

Fix/merge from rebase: BarrelIntake as property

liquid_container
Mark 2016-02-16 21:16:32 +01:00
parent e2689ad1c3 c73993d442
commit 91adb6140a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
planet/Objects.ocd/Items.ocd/Tools.ocd/Barrel.ocd/Script.c
View File

@ -30,8 +30,8 @@ private func Hit()
this->PlayBarrelHitSound();
if (!LiquidContainerIsEmpty())
{
if (GBackLiquid(0, this->GetBarrelIntakeY())
&& GetMaterial(0, this->GetBarrelIntakeY()) != GetLiquidType())
if (GBackLiquid(0, this.BarrelIntakeY)
&& GetMaterial(0, this.BarrelIntakeY) != GetLiquidType())
return;
EmptyBarrel(GetR());
@ -59,7 +59,7 @@ private func Check()
private func FillWithLiquid()
{
var intake = this->GetBarrelIntakeY();
var intake = this.BarrelIntakeY;
if (!GBackLiquid(0, intake)) return;
var mat = GetMaterial(0, intake);
@ -254,3 +254,4 @@ local Collectible = true;
local Name = "$Name$";
local Description = "$Description$";
local ContactIncinerate = 2;
local BarrelIntakeY = 3;