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

Liquid Container: Fixed liquid objects remaining in existence after test.

liquid_container
Mark 2016-02-26 22:38:38 +01:00
parent af8e681ec8
commit 351e61832c
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ func PutLiquid(string liquid_name, int amount, object source)
}
TransferLiquidItem(source);
if (!GetLiquidItem())
if (!GetLiquidItem() && LiquidContainerAccepts(liquid_name))
{
SetLiquidType(liquid_name);
}

9
planet/Tests.ocf/LiquidContainer.ocs/Script.c
View File

@ -273,16 +273,12 @@ global func Test6_Execute()
// fill level
//container->SetLiquidType("Water");
container->SetLiquidFillLevel(0);
test = container->LiquidContainerAccepts("Water"); passed &= test;
Log("- Container returns 'true' if liquid fill level is 0% and material is ok: %v", test);
container->SetLiquidFillLevel(container->GetLiquidContainerMaxFillLevel() / 2);
test = !container->LiquidContainerAccepts("Water"); passed &= test;
// Log("-- Debug: %v", container->IsLiquidContainerForMaterial("Water"));
// Log("-- Debug: %v", container->LiquidContainerIsEmpty());
// Log("-- Debug: %v, %s", container->GetLiquidName() == "Water", container->GetLiquidName());
Log("- Container returns 'false' if liquid fill level is 50% and contained material is 'nil': %v", test);
container->SetLiquidFillLevel(container->GetLiquidContainerMaxFillLevel());
@ -291,11 +287,11 @@ global func Test6_Execute()
// material
Log("Setting container to be filled with a material");
container->SetLiquidType("Lava");
container->SetLiquidType("Oil");
Log("- Fill material is %s", container->GetLiquidType());
container->SetLiquidFillLevel(0);
container->SetLiquidType("Lava");
container->SetLiquidType("Oil");
test = container->LiquidContainerAccepts("Water"); passed &= test;
Log("- Container returns 'true' if filled with material and liquid fill level is 0% and other material is ok: %v", test);
@ -345,7 +341,6 @@ global func Test7_Execute()
test = container->GetLiquidFillLevel() == container->GetLiquidContainerMaxFillLevel(); passed &= test;
Log("- Container returns the fill level when inserting more than the volume: %v", test);
container->RemoveObject();
return passed;
}