diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs index c4ce21670d..30aa72dcf0 100644 --- a/OpenRa.Game/Chrome.cs +++ b/OpenRa.Game/Chrome.cs @@ -363,7 +363,7 @@ namespace OpenRa void CycleRace(bool left) { // hack - var newRace = Game.world.LocalPlayer.Race == RaceUtil.Allies ? RaceUtil.Soviet : RaceUtil.Allies; + var newRace = Game.world.LocalPlayer.Race == "allies" ? "soviet" : "allies"; Game.IssueOrder(Order.Chat("/race " + newRace)); } diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj index e35ff3ac19..090d52c565 100644 --- a/OpenRa.Game/OpenRa.Game.csproj +++ b/OpenRa.Game/OpenRa.Game.csproj @@ -165,7 +165,6 @@ - diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs index 86c1233cab..7c0d089f91 100644 --- a/OpenRa.Game/Player.cs +++ b/OpenRa.Game/Player.cs @@ -62,7 +62,7 @@ namespace OpenRa this.PaletteIndex = client != null ? client.PaletteIndex : index; this.PlayerName = client != null ? client.Name : "Player {0}".F(index+1); - this.Race = client != null ? client.Race : RaceUtil.Allies; + this.Race = client != null ? client.Race : "allies"; } void UpdatePower() diff --git a/OpenRa.Game/Race.cs b/OpenRa.Game/Race.cs deleted file mode 100644 index 77d39f1c65..0000000000 --- a/OpenRa.Game/Race.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; - -namespace OpenRa -{ - public static class RaceUtil - { - /* just while we do the transition */ - public static readonly string Allies = "allies"; - public static readonly string Soviet = "soviet"; - - public static readonly string DefaultRace = Allies; - } - - //[Flags] - //public enum Race - //{ - // None = 0, - // Allies = 1, - // Soviet = 2 - //} -} diff --git a/OpenRa.Game/Sound.cs b/OpenRa.Game/Sound.cs index fac9cd4b96..fe274692c5 100644 --- a/OpenRa.Game/Sound.cs +++ b/OpenRa.Game/Sound.cs @@ -109,8 +109,8 @@ namespace OpenRa return; } - var variants = (voicedUnit.Owner.Race == RaceUtil.Soviet) - ? vi.SovietVariants : vi.AlliedVariants; + var variants = (voicedUnit.Owner.Race == "allies") + ? vi.AlliedVariants : vi.SovietVariants; var variant = variants[voicedUnit.ActorID % variants.Length];