From 002a8edb4ceefa99baf32c1181de2d9a6c1443eb Mon Sep 17 00:00:00 2001 From: Chris Forbes Date: Sat, 9 Jul 2011 11:31:45 +1200 Subject: [PATCH] remove RatioRequired, CriticalRatioRequired from SVC, use info members --- OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs b/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs index 54b11f904a..317bb92f24 100644 --- a/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs +++ b/OpenRA.Mods.RA/Strategic/StrategicVictoryConditions.cs @@ -33,8 +33,6 @@ namespace OpenRA.Mods.RA Actor self; StrategicVictoryConditionsInfo info; - public float RatioRequired; - public float CriticalRatioRequired; [Sync] public bool SplitHolds; [Sync] public int TicksLeft = 0; [Sync] public int CriticalTicksLeft = 0; @@ -43,9 +41,6 @@ namespace OpenRA.Mods.RA { this.self = self; this.info = info; - - RatioRequired = info.RatioRequired; - CriticalRatioRequired = info.CriticalRatioRequired; SplitHolds = info.SplitHolds; } @@ -103,7 +98,7 @@ namespace OpenRA.Mods.RA { var criticalOwned = 1f / TotalCritical * OwnedCritical; - return (criticalOwned >= CriticalRatioRequired); + return criticalOwned >= info.CriticalRatioRequired; } } @@ -113,7 +108,7 @@ namespace OpenRA.Mods.RA { var owned = 1f / Total * Owned; - return (owned >= RatioRequired); + return owned >= info.RatioRequired; } }