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

Remove \r

Browse Source 
we use \n everywhere else in the engine
This commit is contained in:
Gustas
2023-05-20 20:24:03 +03:00
committed by Pavel Penev
parent 8a1463a471
commit 211f7160dc
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/GameRules/ActorInfo.cs
View File

@@ -141,20 +141,20 @@ namespace OpenRA
if (unresolved.Count != 0) if (unresolved.Count != 0)
{ {
var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\r\n"; var exceptionString = "ActorInfo(\"" + Name + "\") failed to initialize because of the following:\n";
var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => AreResolvable(d, s.Type)))).Distinct(); var missing = unresolved.SelectMany(u => u.Dependencies.Where(d => !source.Any(s => AreResolvable(d, s.Type)))).Distinct();
exceptionString += "Missing:\r\n"; exceptionString += "Missing:\n";
foreach (var m in missing) foreach (var m in missing)
exceptionString += m + " \r\n"; exceptionString += m + " \n";
exceptionString += "Unresolved:\r\n"; exceptionString += "Unresolved:\n";
foreach (var u in unresolved) foreach (var u in unresolved)
{ {
var deps = u.Dependencies.Where(d => !resolved.Exists(r => r.Type == d)); var deps = u.Dependencies.Where(d => !resolved.Exists(r => r.Type == d));
var optDeps = u.OptionalDependencies.Where(d => !resolved.Exists(r => r.Type == d)); var optDeps = u.OptionalDependencies.Where(d => !resolved.Exists(r => r.Type == d));
var allDeps = string.Join(", ", deps.Select(o => o.ToString()).Concat(optDeps.Select(o => $"[{o}]"))); var allDeps = string.Join(", ", deps.Select(o => o.ToString()).Concat(optDeps.Select(o => $"[{o}]")));
exceptionString += $"{u.Type}: {{ {allDeps} }}\r\n"; exceptionString += $"{u.Type}: {{ {allDeps} }}\n";
} }
throw new YamlException(exceptionString); throw new YamlException(exceptionString);

2
OpenRA.Game/GameRules/Ruleset.cs
View File

@@ -244,7 +244,7 @@ namespace OpenRA
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Write("debug", "Error in AnyFlaggedTraits\r\n" + ex.ToString()); Log.Write("debug", "Error in AnyFlaggedTraits\n" + ex.ToString());
} }
} }
} }