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

Allow repeated ejection of infinite material stack counts in bucket and barrel

console-destruction
Sven Eberhardt 2016-09-05 20:08:30 -04:00
parent 3330c592e3
commit db986e3dd7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.ocd/Items.ocd/Tools.ocd/Bucket.ocd/Script.c
View File

@ -67,7 +67,7 @@ public func ControlUse(object clonk, int iX, int iY)
if (IsBucketFilled())
{
Spill(angle);
EmptyBucket();
if (Contents(0) && !Contents(0)->IsInfiniteStackCount()) EmptyBucket();
PlayBucketAnimation(clonk);
return true;
}

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

@ -80,8 +80,8 @@ func FxIntLiquidDispersionTimer(object target, proplist fx, int timer)
func Disperse(int angle, int strength)
{
// does nothing but remove the object - overload if you want special effects
RemoveObject();
// does nothing but remove the object (unless it's an infinite stack) - overload if you want special effects
if (!IsInfiniteStackCount()) RemoveObject();
}
func DisperseMaterial(string material_name, int amount, int strength, int angle, int angle_variance)