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

ExtraSlot works for non-items too

Tobias Zwick 2010-07-17 18:53:01 +02:00
parent 1b5223833a
commit a1a76473d6
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
planet/Objects.c4d/HUD.c4d/Elements.c4d/ObjectSelector.c4d/ExtraSlot.c4d/Script.c
View File

@ -119,8 +119,6 @@ public func SetContainer(object c)
if(container == c) return;
container = c;
var clonk = container->Contained();
SetOwner(clonk->GetOwner());
container->~SetHUDObject(this);
Update();

6
planet/Objects.c4d/HUD.c4d/Elements.c4d/ObjectSelector.c4d/Script.c
View File

@ -274,8 +274,8 @@ public func SetObject(object obj, int type, int pos, int hot)
SetName(Format("$TxtSelect$",myobject->GetName()));
if(actiontype == ACTIONTYPE_INVENTORY)
{
//if(actiontype == ACTIONTYPE_INVENTORY)
//{
// create an effect which monitors whether the object is removed
AddEffect("IntRemoveGuard",myobject,1,0,this);
@ -293,7 +293,7 @@ public func SetObject(object obj, int type, int pos, int hot)
{
subselector->RemoveObject();
}
}
//}
}
ShowHotkey();