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

Replace F extension with string interpolation

Browse Source
This commit is contained in:
teinarss
2021-04-24 17:46:24 +02:00
committed by reaperrr
parent 1385aca783
commit 10676be377
300 changed files with 752 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Cnc/SpriteLoaders/ShpRemasteredLoader.cs
View File

@@ -75,7 +75,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
framePrefix = prefix;
if (prefix != framePrefix)
throw new InvalidDataException("Frame prefix mismatch: `{0}` != `{1}`".F(prefix, framePrefix));
throw new InvalidDataException($"Frame prefix mismatch: `{prefix}` != `{framePrefix}`");
frameCount = Math.Max(frameCount, int.Parse(match.Groups["frame"].Value) + 1);
}
@@ -83,7 +83,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
var frames = new ISpriteFrame[frameCount];
for (var i = 0; i < frames.Length; i++)
{
var tgaEntry = container.GetEntry("{0}{1:D4}.tga".F(framePrefix, i));
var tgaEntry = container.GetEntry($"{framePrefix}{i:D4}.tga");
// Blank frame
if (tgaEntry == null)
@@ -92,7 +92,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
continue;
}
var metaEntry = container.GetEntry("{0}{1:D4}.meta".F(framePrefix, i));
var metaEntry = container.GetEntry($"{framePrefix}{i:D4}.meta");
using (var tgaStream = container.GetInputStream(tgaEntry))
{
var metaStream = metaEntry != null ? container.GetInputStream(metaEntry) : null;

2
OpenRA.Mods.Cnc/SpriteLoaders/ShpTDLoader.cs
View File

@@ -147,7 +147,7 @@ namespace OpenRA.Mods.Cnc.SpriteLoaders
if (h.Format == Format.XORPrev)
h.RefImage = headers[i - 1];
else if (h.Format == Format.XORLCW && !offsets.TryGetValue(h.RefOffset, out h.RefImage))
throw new InvalidDataException("Reference doesn't point to image data {0}->{1}".F(h.FileOffset, h.RefOffset));
throw new InvalidDataException($"Reference doesn't point to image data {h.FileOffset}->{h.RefOffset}");
}
shpBytesFileOffset = stream.Position;