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

Objects: Interactables return true on Interact()

Maikel de Vries 2011-09-29 23:23:06 +02:00
parent 2b70a27df2
commit a7763beb25
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
planet/Objects.ocd/Environment.ocd/Vegetation.ocd/Mushroom.ocd/Script.c
View File

@ -22,6 +22,7 @@ public func Interact(object clonk)
this.Collectible = 1;
if(clonk->ContentsCount() < clonk->MaxContentsCount())
Enter(clonk);
return true;
}
public func IsInteractable(object clonk)

1
planet/Objects.ocd/Items.ocd/Tools.ocd/Ropeladder.ocd/LadderGrabber.ocd/Script.c
View File

@ -7,6 +7,7 @@ public func Interact(object clonk)
GetActionTarget()->StartRollUp();
else
RemoveObject();
return true;
}
public func IsInteractable(object clonk)

8
planet/Objects.ocd/Libraries.ocd/ItemContainer.ocd/Script.c
View File

@ -38,7 +38,7 @@ public func IsInteractable() { return MenuOnInteraction(); }
public func Interact(object clonk)
{
if (MenuOnInteraction())
OpenMenu(clonk);
return OpenMenu(clonk);
else
return _inherited(clonk, ...);
}
@ -46,19 +46,17 @@ public func Interact(object clonk)
public func ControlUse(object clonk)
{
if (MenuOnControlUse())
OpenMenu(clonk);
return OpenMenu(clonk);
else
return _inherited(clonk, ...);
return true;
}
public func ControlUseAlt(object clonk)
{
if (MenuOnControlUseAlt())
OpenMenu(clonk);
return OpenMenu(clonk);
else
return _inherited(clonk, ...);
return true;
}
public func OpenMenu(object clonk)