forked from Mirrors/openclonk
Fixed beeing able to drop carryheavy in non-walk
parent
fe261ffca0
commit
9a4295f745
|
@ -623,7 +623,7 @@ public func FxIntSearchInteractionObjectsTimer(object target, effect, int time)
|
||||||
}
|
}
|
||||||
|
|
||||||
// if carrying heavy, add drop-carry-heavy-button
|
// if carrying heavy, add drop-carry-heavy-button
|
||||||
if(target->~IsCarryingHeavy())
|
if(target->~IsCarryingHeavy() && target->GetAction() == "Walk")
|
||||||
ActionButton(target, i++, target->GetCarryHeavy(), ACTIONTYPE_CARRYHEAVY, hotkey++);
|
ActionButton(target, i++, target->GetCarryHeavy(), ACTIONTYPE_CARRYHEAVY, hotkey++);
|
||||||
|
|
||||||
// add vehicles
|
// add vehicles
|
||||||
|
@ -806,4 +806,3 @@ public func ReorderCrewSelectors(object leaveout)
|
||||||
j++;
|
j++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -855,7 +855,7 @@ public func ObjectControl(int plr, int ctrl, int x, int y, int strength, bool re
|
||||||
{
|
{
|
||||||
if(ObjectControlInteract(plr,ctrl))
|
if(ObjectControlInteract(plr,ctrl))
|
||||||
return true;
|
return true;
|
||||||
else if(IsCarryingHeavy())
|
else if(IsCarryingHeavy() && GetAction() == "Walk")
|
||||||
{
|
{
|
||||||
GetCarryHeavy()->Drop();
|
GetCarryHeavy()->Drop();
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in New Issue