From f456e41a452bd93ee4216d0cf4cf6a9ec48e2490 Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Thu, 16 Sep 2010 18:07:42 +1200 Subject: [PATCH] check if a passenger is appropriate for reverse-enter-transport --- OpenRA.Mods.RA/Cargo.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.RA/Cargo.cs b/OpenRA.Mods.RA/Cargo.cs index 40a9fd4921..bac43a56b2 100644 --- a/OpenRA.Mods.RA/Cargo.cs +++ b/OpenRA.Mods.RA/Cargo.cs @@ -9,6 +9,7 @@ #endregion using System.Collections.Generic; +using System.Linq; using OpenRA.Mods.RA.Activities; using OpenRA.Traits; @@ -36,8 +37,13 @@ namespace OpenRA.Mods.RA if (mi.Button == MouseButton.Right && underCursor == self) return new Order("Unload", self); - if( mi.Button == MouseButton.Right && underCursor != null && underCursor.Owner == self.Owner ) - return new Order("EnterTransport", underCursor, self); + if (mi.Button == MouseButton.Right && underCursor != null && underCursor.Owner == self.Owner) + { + var pi = underCursor.Info.Traits.GetOrDefault(); + var ci = self.Info.Traits.Get(); + if (pi != null && ci.Types.Contains(pi.CargoType)) + return new Order("EnterTransport", underCursor, self); + } return null; }