Merge pull request #5838 from obrakmann/fix5378

Fix non-infantry support units starting on subcells. Fixes #5378
2014-07-06 12:09:01 +02:00
parent 58cb603803 bb38521d70
commit bf1743ac6e
2 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@@ -61,6 +61,7 @@ Also thanks to:
    * Nukem
    * Okunev Yu Dmitry (xaionaro)
    * Olaf van der Spek
+    * Oliver Brakmann
    * Paolo Chiodi (paolochiodi)
    * Paul Dovydaitis (pdovy)
    * Pavlos Touboulidis (pav)
--- a/OpenRA.Mods.RA/SpawnMPUnits.cs
+++ b/OpenRA.Mods.RA/SpawnMPUnits.cs
@@ -62,7 +62,7 @@ namespace OpenRA.Mods.RA
 					throw new InvalidOperationException("No cells available to spawn starting unit {0}".F(s));

 				var cell = validCells.Random(w.SharedRandom);
-				var subCell = w.ActorMap.FreeSubCell(cell).Value;
+				var subCell = mi.SharesCell ? w.ActorMap.FreeSubCell(cell).Value : SubCell.FullCell;

 				w.CreateActor(s.ToLowerInvariant(), new TypeDictionary
 				{