epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused code from Cargo trait

Browse Source
This commit is contained in:
teinarss
2019-11-23 11:12:21 +01:00
committed by tovl
parent a9d7535915
commit 76221471ff
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OpenRA.Mods.Common/Traits/Cargo.cs
View File

@@ -283,10 +283,10 @@ namespace OpenRA.Mods.Common.Traits
} }
// Prepare for transport pickup // Prepare for transport pickup
bool LockForPickup(Actor self) void LockForPickup(Actor self)
{ {
if (state == State.Locked) if (state == State.Locked)
return false; return;
state = State.Locked; state = State.Locked;
@@ -300,7 +300,6 @@ namespace OpenRA.Mods.Common.Traits
} }
self.QueueActivity(new WaitFor(() => state != State.Locked, false)); self.QueueActivity(new WaitFor(() => state != State.Locked, false));
return true;
} }
void ReleaseLock(Actor self) void ReleaseLock(Actor self)
@@ -317,14 +316,6 @@ namespace OpenRA.Mods.Common.Traits
takeOffAfterLoad = false; 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) public string VoicePhraseForOrder(Actor self, Order order)
{ {
if (order.OrderString != "Unload" || IsEmpty(self) || !self.HasVoice(Info.UnloadVoice)) if (order.OrderString != "Unload" || IsEmpty(self) || !self.HasVoice(Info.UnloadVoice))