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

Fix the build after a bad merge

Browse Source 
Merging #9187 without rebasing it on post-#9182 bleed was a bad idea.
This commit is contained in:
Pavel Penev
2015-09-02 15:22:14 +03:00
parent ba9abc9e0a
commit a3633671a9
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Game/FieldSaver.cs
View File

@@ -36,7 +36,7 @@ namespace OpenRA
var key = ((System.Collections.DictionaryEntry)kvp).Key; var key = ((System.Collections.DictionaryEntry)kvp).Key;
var value = ((System.Collections.DictionaryEntry)kvp).Value; var value = ((System.Collections.DictionaryEntry)kvp).Value;
nodes.Add(new MiniYamlNode(FormatValue(key, key.GetType()), FormatValue(value, value.GetType()))); nodes.Add(new MiniYamlNode(FormatValue(key), FormatValue(value)));
} }
} }
else if (info.Attribute.FromYamlKey) else if (info.Attribute.FromYamlKey)
@@ -114,8 +114,8 @@ namespace OpenRA
var key = ((System.Collections.DictionaryEntry)kvp).Key; var key = ((System.Collections.DictionaryEntry)kvp).Key;
var value = ((System.Collections.DictionaryEntry)kvp).Value; var value = ((System.Collections.DictionaryEntry)kvp).Value;
var formattedKey = FormatValue(key, key.GetType()); var formattedKey = FormatValue(key);
var formattedValue = FormatValue(value, value.GetType()); var formattedValue = FormatValue(value);
result += "{0}: {1}{2}".F(formattedKey, formattedValue, Environment.NewLine); result += "{0}: {1}{2}".F(formattedKey, formattedValue, Environment.NewLine);
} }