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

Fixed special owner cases

Browse Source 
git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1136 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
beedee
2007-07-07 08:06:59 +00:00
parent 91e573dcd4
commit 572533978b
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenRa.TechTreeTest/Building.cs
View File

@@ -10,6 +10,7 @@ namespace OpenRa.TechTreeTest
[Flags] [Flags]
public enum BuildingRace public enum BuildingRace
{ {
None = 0,
Allies = 1, Allies = 1,
Soviet = 2 Soviet = 2
} }

20
OpenRa.TechTreeTest/TechTree.cs
View File

@@ -31,17 +31,25 @@ namespace OpenRa.TechTreeTest
string s = section.GetValue("Prerequisite", "").ToUpper(); string s = section.GetValue("Prerequisite", "").ToUpper();
b.Prerequisites = s.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); b.Prerequisites = s.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
b.TechLevel = int.Parse(section.GetValue("TechLevel", "-1")); b.TechLevel = int.Parse(section.GetValue("TechLevel", "-1"));
s = section.GetValue("Owner", "allies"); s = section.GetValue("Owner", "");
if (string.IsNullOrEmpty(s)) continue;
string[] frags = s.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries); if (string.IsNullOrEmpty(s))
if (frags.Length > 1) {
b.Owner = BuildingRace.None;
continue;
}
if (s.Equals("Both", StringComparison.InvariantCultureIgnoreCase))
{ {
b.Owner = BuildingRace.Allies | BuildingRace.Soviet; b.Owner = BuildingRace.Allies | BuildingRace.Soviet;
continue;
} }
string[] frags = s.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
if (frags.Length > 1)
b.Owner = BuildingRace.Allies | BuildingRace.Soviet;
else else
{
b.Owner = (BuildingRace)Enum.Parse(typeof(BuildingRace), frags[0], true); b.Owner = (BuildingRace)Enum.Parse(typeof(BuildingRace), frags[0], true);
}
} }
} }