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

Prevent multiple enumeration of validCells in SpawnMPUnits

Browse Source
This commit is contained in:
teinarss
2019-01-15 20:41:43 +01:00
committed by reaperrr
parent f91d3f2603
commit be741cea5e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.Common/Traits/World/SpawnMPUnits.cs
View File

@@ -103,20 +103,20 @@ namespace OpenRA.Mods.Common.Traits
{ {
var actorRules = w.Map.Rules.Actors[s.ToLowerInvariant()]; var actorRules = w.Map.Rules.Actors[s.ToLowerInvariant()];
var ip = actorRules.TraitInfo<IPositionableInfo>(); var ip = actorRules.TraitInfo<IPositionableInfo>();
var validCells = supportSpawnCells.Where(c => ip.CanEnterCell(w, null, c)); var validCell = supportSpawnCells.Shuffle(w.SharedRandom).FirstOrDefault(c => ip.CanEnterCell(w, null, c));
if (!validCells.Any())
if (validCell == CPos.Zero)
{ {
Log.Write("debug", "No cells available to spawn starting unit {0} for player {1}".F(s, p)); Log.Write("debug", "No cells available to spawn starting unit {0} for player {1}".F(s, p));
continue; continue;
} }
var cell = validCells.Random(w.SharedRandom); var subCell = ip.SharesCell ? w.ActorMap.FreeSubCell(validCell) : 0;
var subCell = ip.SharesCell ? w.ActorMap.FreeSubCell(cell) : 0;
w.CreateActor(s.ToLowerInvariant(), new TypeDictionary w.CreateActor(s.ToLowerInvariant(), new TypeDictionary
{ {
new OwnerInit(p), new OwnerInit(p),
new LocationInit(cell), new LocationInit(validCell),
new SubCellInit(subCell), new SubCellInit(subCell),
new FacingInit(unitGroup.SupportActorsFacing < 0 ? w.SharedRandom.Next(256) : unitGroup.SupportActorsFacing) new FacingInit(unitGroup.SupportActorsFacing < 0 ? w.SharedRandom.Next(256) : unitGroup.SupportActorsFacing)
}); });