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

Refactoring: Producers: Removed special case in IsCollectionAllowed() 

The special case can be handled in RejectCollect(). Unit tests passed.
liquid_container
Mark 2016-03-24 22:20:55 +01:00
parent ff89f337de
commit 0ef237988e
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
planet/Objects.ocd/Libraries.ocd/Structures.ocd/Producer.ocd/Script.c
View File

@ -854,26 +854,6 @@ public func IsCollectionAllowed(object item)
}
}
}
// Liquid containers may not be collected, but we take their contents if a product needs them.
if (item->~IsLiquidContainer())
{
for (var product in products)
{
var i = 0, component_id;
while (component_id = GetComponent(nil, i, nil, product))
{
for (var liquid in FindObjects(Find_Container(item)))
{
if (liquid->~GetLiquidType() == component_id->~GetLiquidType())
{
liquid->Enter(this);
}
}
i++;
}
}
return false;
}
return false;
}
@ -881,7 +861,7 @@ public func IsCollectionAllowed(object item)
public func RejectCollect(id item_id, object item)
{
// Is the object a container? If so, try to empty it.
if (item->~IsContainer())
if (item->~IsContainer() || item->~IsLiquidContainer())
{
var count = item->ContentsCount(), contents;
while (--count >= 0)