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

Deprecate string format log shorthand.

Browse Source
This commit is contained in:
Matthias Mailänder
2023-05-04 17:44:46 +02:00
committed by abcdefg30
parent e251126dd4
commit 1c2ce0dcc0
27 changed files with 100 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/Scripting/Properties/CombatProperties.cs
View File

@@ -91,10 +91,10 @@ namespace OpenRA.Mods.Common.Scripting
{
var target = Target.FromActor(targetActor);
if (!target.IsValidFor(Self))
Log.Write("lua", "{1} is an invalid target for {0}!", Self, targetActor);
Log.Write("lua", $"{targetActor} is an invalid target for {Self}!");
if (!targetActor.Info.HasTraitInfo<FrozenUnderFogInfo>() && !targetActor.CanBeViewedByPlayer(Self.Owner))
Log.Write("lua", "{1} is not revealed for player {0}!", Self.Owner, targetActor);
Log.Write("lua", $"{targetActor} is not revealed for player {Self.Owner}!");
foreach (var attack in attackBases)
attack.AttackTarget(target, AttackSource.Default, true, allowMove, forceAttack);

6
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -968,7 +968,7 @@ namespace OpenRA.Mods.Common.Server
if (!Exts.TryParseIntegerInvariant(parts[1], out var team))
{
Log.Write("server", "Invalid team: {0}", s);
Log.Write("server", $"Invalid team: {s}");
return false;
}
@@ -996,7 +996,7 @@ namespace OpenRA.Mods.Common.Server
if (!Exts.TryParseIntegerInvariant(parts[1], out var handicap))
{
Log.Write("server", "Invalid handicap: {0}", s);
Log.Write("server", $"Invalid handicap: {s}");
return false;
}
@@ -1004,7 +1004,7 @@ namespace OpenRA.Mods.Common.Server
var options = Enumerable.Range(0, 20).Select(i => 5 * i);
if (!options.Contains(handicap))
{
Log.Write("server", "Invalid handicap: {0}", s);
Log.Write("server", $"Invalid handicap: {s}");
return false;
}

2
OpenRA.Mods.Common/Traits/World/ValidateOrder.cs
View File

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
if (subjectClient == null)
{
Log.Write("debug", "Tick {0}: Order sent to {1}: resolved ClientIndex `{2}` doesn't exist", world.WorldTick, order.Subject.Owner.PlayerName, subjectClientId);
Log.Write("debug", $"Tick {world.WorldTick}: Order sent to {order.Subject.Owner.PlayerName}: resolved ClientIndex `{subjectClientId}` doesn't exist");
return false;
}

4
OpenRA.Mods.Common/Widgets/Logic/Editor/ActorSelectorLogic.cs
View File

@@ -222,8 +222,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
}
catch
{
Log.Write("debug", "Map editor ignoring actor {0}, because of missing sprites for tileset {1}.",
actor.Name, World.Map.Rules.TerrainInfo.Id);
Log.Write("debug", $"Map editor ignoring actor {actor.Name}, "
+ $"because of missing sprites for tileset {World.Map.Rules.TerrainInfo.Id}.");
continue;
}
}