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

Cache the speed modifiers enumerable, not just the traits, in Mobile.

Browse Source
This commit is contained in:
RoosterDragon
2015-08-21 20:24:59 +01:00
parent d9dd96ca35
commit 0739fc80a3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Mobile.cs
View File

@@ -310,7 +310,7 @@ namespace OpenRA.Mods.Common.Traits
internal int TicksBeforePathing = 0; internal int TicksBeforePathing = 0;
readonly Actor self; readonly Actor self;
readonly Lazy<ISpeedModifier[]> speedModifiers; readonly Lazy<IEnumerable<int>> speedModifiers;
public readonly MobileInfo Info; public readonly MobileInfo Info;
public bool IsMoving { get; set; } public bool IsMoving { get; set; }
@@ -351,7 +351,7 @@ namespace OpenRA.Mods.Common.Traits
self = init.Self; self = init.Self;
Info = info; Info = info;
speedModifiers = Exts.Lazy(() => self.TraitsImplementing<ISpeedModifier>().ToArray()); speedModifiers = Exts.Lazy(() => self.TraitsImplementing<ISpeedModifier>().ToArray().Select(x => x.GetSpeedModifier()));
ToSubCell = FromSubCell = info.SharesCell ? init.World.Map.DefaultSubCell : SubCell.FullCell; ToSubCell = FromSubCell = info.SharesCell ? init.World.Map.DefaultSubCell : SubCell.FullCell;
if (init.Contains<SubCellInit>()) if (init.Contains<SubCellInit>())
@@ -608,7 +608,7 @@ namespace OpenRA.Mods.Common.Traits
if (terrainSpeed == 0) if (terrainSpeed == 0)
return 0; return 0;
var modifiers = speedModifiers.Value.Select(x => x.GetSpeedModifier()).Append(terrainSpeed); var modifiers = speedModifiers.Value.Append(terrainSpeed);
return Util.ApplyPercentageModifiers(Info.Speed, modifiers); return Util.ApplyPercentageModifiers(Info.Speed, modifiers);
} }