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

Fixed Non-Inventory-Contents(CarryHeavy) using up Space in the ContentsMenu (#778)

Bernhard Bonigl 2012-05-13 20:37:44 +02:00
parent f327ee7c12
commit 0729c4577f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
View File

@ -82,6 +82,18 @@ public func GetItems()
return inv; return inv;
} }
/** Returns how many items are in the clonks inventory
Does not have to be the same as ContentCounts() because of objects with special handling, like CarryHeavy */
public func GetItemCount()
{
var count = 0;
for(var i=0; i < GetLength(inventory); i++)
if(inventory[i])
count++;
return count;
}
/** Get the 'i'th item in hands. /** Get the 'i'th item in hands.
These are the items that will be used with use-commands. (Left mouse click, etc...) */ These are the items that will be used with use-commands. (Left mouse click, etc...) */
public func GetHandItem(int i) public func GetHandItem(int i)
@ -494,7 +506,7 @@ protected func RejectCollect(id objid, object obj)
// collection of that object magically disabled? // collection of that object magically disabled?
if(GetEffect("NoCollection", obj)) return true; if(GetEffect("NoCollection", obj)) return true;
// Carry heavy only gets picked up if non held already // Carry heavy only gets picked up if none held already
if(obj->~IsCarryHeavy()) if(obj->~IsCarryHeavy())
{ {
if(IsCarryingHeavy()) if(IsCarryingHeavy())
@ -540,7 +552,7 @@ protected func RejectCollect(id objid, object obj)
public func AllowTransfer(object obj) public func AllowTransfer(object obj)
{ {
// Only check max contents. // Only check max contents.
if (ContentsCount() >= MaxContentsCount()) if (GetItemCount() >= MaxContentsCount())
return false; return false;
// don't allow picking up multiple carryheavy-objects // don't allow picking up multiple carryheavy-objects