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

Clonk now aborts usage if a related inventory-slot is changed. (e.g. when aiming the bow)

rope
Bernhard Bonigl 2012-04-29 16:26:32 +02:00
parent 8c9536c197
commit 5ae4496d7f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ public func GetHandItem(int i)
/** Set the 'hand'th use-item to the 'inv'th slot */
public func SetHandItemPos(int hand, int inv)
{
// indices are in range?
// indices are in range?
if(hand >= HandObjects() || inv >= MaxContentsCount())
return nil;
if(hand < 0 || inv < 0) return nil;
@ -110,6 +110,15 @@ public func SetHandItemPos(int hand, int inv)
if(IsCarryingHeavy())
return nil;
// changing slots cancels using, if the slot with the used object is contained
if(using)
{
var used_slot = GetItemPos(using);
if(used_slot != nil)
if(used_slot == GetHandItemPos(hand) || used_slot == inv)
CancelUseControl(0,0);
}
// If the item is already selected, we can't hold it in another one too.
var hand2 = GetHandPosByItemPos(inv);
if(hand2 != nil)