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

liquid library: fixes and typos

install-platforms
Maikel de Vries 2018-01-12 09:27:30 +01:00
parent 78060d59e2
commit 84ad52251f
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/Resources.ocd/Concrete.ocd/Script.c
View File

@ -29,7 +29,7 @@ public func Construction(object creator)
{
var res = _inherited(creator, ...);
// If the concrete is created by the foundry we can safely assume it has been produced
// and set the stack count to 100. The only exceptions are CreateContents script calls.
// and set the stack count to 200. The only exceptions are CreateContents script calls.
if (creator && creator->~IsProducer())
SetStackCount(200);
return res;

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

@ -95,7 +95,7 @@ public func DisperseMaterial(string material_name, int amount, int strength, int
strength = strength ?? 30;
angle_variance = angle_variance ?? 30;
CastPXS(material_name, amount, strength, 0, 0, angle, 30);
CastPXS(material_name, amount, strength, 0, 0, angle, angle_variance);
}
public func DisperseParticles(string particle_name, int amount, int strength, int angle, int angle_variance, proplist template, int lifetime)
@ -212,7 +212,7 @@ public func RemoveLiquid(liquid_name, int amount, object destination)
FatalError(Format("You can remove positive amounts of liquid only, got %d", amount));
}
if (GetType(liquid_name) != C4V_String && GetType(liquid_name) != C4V_Def)
if (liquid_name != nil && GetType(liquid_name) != C4V_String && GetType(liquid_name) != C4V_Def)
{
FatalError(Format("The first parameter of RemoveLiquid() must either be a string or definition. You passed %v.", GetType(liquid_name)));
}