Deprecate string format shorthand.
This commit is contained in:
committed by
abcdefg30
parent
1c2ce0dcc0
commit
65c0cf1065
@@ -136,7 +136,7 @@ namespace OpenRA.Mods.Common.Traits
|
||||
if (countdownLabel != null)
|
||||
{
|
||||
countdown = new CachedTransform<int, string>(t =>
|
||||
info.CountdownText.F(WidgetUtils.FormatTime(t, w.Timestep)));
|
||||
string.Format(info.CountdownText, WidgetUtils.FormatTime(t, w.Timestep)));
|
||||
countdownLabel.GetText = () => TimeLimit > 0 ? countdown.Update(ticksRemaining) : "";
|
||||
}
|
||||
}
|
||||
@@ -167,7 +167,7 @@ namespace OpenRA.Mods.Common.Traits
|
||||
{
|
||||
if (ticksRemaining == m * 60 * ticksPerSecond)
|
||||
{
|
||||
TextNotificationsManager.AddSystemLine(Notification.F(m, m > 1 ? "s" : null));
|
||||
TextNotificationsManager.AddSystemLine(string.Format(Notification, m, m > 1 ? "s" : null));
|
||||
|
||||
var faction = self.World.LocalPlayer?.Faction.InternalName;
|
||||
Game.Sound.PlayNotification(self.World.Map.Rules, self.World.LocalPlayer, "Speech", info.TimeLimitWarnings[m], faction);
|
||||
|
||||
Reference in New Issue
Block a user