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

Prefer ReadUInt8 over ReadByte.

Browse Source 
The former will throw when the end of the stream is reached, rather than requiring the caller to check for -1.
This commit is contained in:
RoosterDragon
2020-10-18 11:35:21 +01:00
committed by abcdefg30
parent f5f2f58664
commit aac1bae899
10 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Mods.Common/FileFormats/WavReader.cs
View File

@@ -18,7 +18,7 @@ namespace OpenRA.Mods.Common.FileFormats
{
public static class WavReader
{
enum WaveType { Pcm = 0x1, MsAdpcm = 0x2, ImaAdpcm = 0x11 }
enum WaveType : short { Pcm = 0x1, MsAdpcm = 0x2, ImaAdpcm = 0x11 }
public static bool LoadSound(Stream s, out Func<Stream> result, out short channels, out int sampleBits, out int sampleRate, out float lengthInSeconds)
{
@@ -45,7 +45,7 @@ namespace OpenRA.Mods.Common.FileFormats
while (s.Position < s.Length)
{
if ((s.Position & 1) == 1)
s.ReadByte(); // Alignment
s.ReadUInt8(); // Alignment
if (s.Position == s.Length)
break; // Break if we aligned with end of stream

2
OpenRA.Mods.Common/FileSystem/InstallShieldPackage.cs
View File

@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.FileSystem
s.Position += 12;
var chunkSize = s.ReadUInt16();
s.Position += 4;
var nameLength = s.ReadByte();
var nameLength = s.ReadUInt8();
var fileName = dirName + "\\" + s.ReadASCII(nameLength);
// Use index syntax to overwrite any duplicate entries with the last value