From 76221471ff113c99a040c46464e86d1dbc93356e Mon Sep 17 00:00:00 2001 From: teinarss Date: Sat, 23 Nov 2019 11:12:21 +0100 Subject: [PATCH] Remove unused code from Cargo trait --- OpenRA.Mods.Common/Traits/Cargo.cs | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Cargo.cs b/OpenRA.Mods.Common/Traits/Cargo.cs index f621703e71..8921a148d0 100644 --- a/OpenRA.Mods.Common/Traits/Cargo.cs +++ b/OpenRA.Mods.Common/Traits/Cargo.cs @@ -283,10 +283,10 @@ namespace OpenRA.Mods.Common.Traits } // Prepare for transport pickup - bool LockForPickup(Actor self) + void LockForPickup(Actor self) { if (state == State.Locked) - return false; + return; state = State.Locked; @@ -300,7 +300,6 @@ namespace OpenRA.Mods.Common.Traits } self.QueueActivity(new WaitFor(() => state != State.Locked, false)); - return true; } void ReleaseLock(Actor self) @@ -317,14 +316,6 @@ namespace OpenRA.Mods.Common.Traits takeOffAfterLoad = false; } - public string CursorForOrder(Actor self, Order order) - { - if (order.OrderString != "Unload") - return null; - - return CanUnload() ? Info.UnloadCursor : Info.UnloadBlockedCursor; - } - public string VoicePhraseForOrder(Actor self, Order order) { if (order.OrderString != "Unload" || IsEmpty(self) || !self.HasVoice(Info.UnloadVoice))