From 027887aa13b40c8de2d849349976ffaad604a0b9 Mon Sep 17 00:00:00 2001 From: atlimit8 Date: Mon, 21 Jul 2014 05:35:49 -0500 Subject: [PATCH 1/2] AUTHORS --- AUTHORS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 915acecedc..090b53d2eb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -38,9 +38,11 @@ Also thanks to: * Frank Razenberg (zzattack) * Gareth Needham (Ripley`) * Gordon Martin (Happy0) + * Ian T. Jacobsen (Smilex) * Igor Popov (ihptru) * Iran * James Dunne (jsd) + * Jason (atlimit8) * Jeff Harris (jeff_1amstudios) * Jes * Joakim Lindberg (booom3) @@ -84,7 +86,6 @@ Also thanks to: * Tristan Mühlbacher (MicroBit) * Vladimir Komarov (VrKomarov) * Wuschel - * Ian T. Jacobsen (Smilex) Using Simple DirectMedia Layer distributed under the terms of the zlib license. From 0ba1fdcea3a57e02bea5f3b46d1db20313226f08 Mon Sep 17 00:00:00 2001 From: atlimit8 Date: Fri, 25 Jul 2014 17:16:54 -0500 Subject: [PATCH 2/2] Allow actors that are not buildings to be sold. The more humane way to refund units (as opposed the grinding them). --- OpenRA.Mods.RA/Sellable.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpenRA.Mods.RA/Sellable.cs b/OpenRA.Mods.RA/Sellable.cs index 77a04c7b2e..e6e8a66b03 100644 --- a/OpenRA.Mods.RA/Sellable.cs +++ b/OpenRA.Mods.RA/Sellable.cs @@ -31,7 +31,8 @@ namespace OpenRA.Mods.RA public void Sell(Actor self) { - if (!self.Trait().Lock()) + var building = self.TraitOrDefault(); + if (building != null && !building.Lock()) return; self.CancelActivity();