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

Surrounding: ContentsCount() works with ID now

liquid_container
Mark 2016-04-07 17:32:34 +02:00
parent 69467d3c70
commit 733d5ccca8
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
planet/Objects.ocd/Clonk.ocd/Surrounding.ocd/Script.c
View File

@ -17,10 +17,25 @@ public func Contents(int index)
return current_objects[index];
}
public func ContentsCount()
public func ContentsCount(id definition)
{
RefreshIfNecessary();
return GetLength(current_objects);
if (definition == nil)
{
return GetLength(current_objects);
}
else
{
var count = 0;
for (var index = 0; index < GetLength(current_objects); ++index)
if (current_objects[index] && current_objects[index]->GetID() == definition)
{
count += 1;
}
return count;
}
}
private func RefreshIfNecessary()
@ -79,7 +94,9 @@ public func Collect(object obj)
{
// Special treatment for objects that the Clonk holds. Just use the appropriate library function.
if (container->~IsClonk() && !obj->~IsCarryHeavy())
{
container->DropInventoryItem(container->GetItemPos(obj));
}
else
{
// Otherwise, just force-drop it at the clonks's bottom.