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

Mop up active Stylecop nits.

Browse Source 
Style consistency cleanup.
This commit is contained in:
Peter Antal
2018-02-25 12:41:54 -08:00
committed by Paul Chote
parent 701675fd4c
commit 9ce0bcb0b7
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Map/MapGrid.cs
View File

@@ -89,8 +89,12 @@ namespace OpenRA
var defaultSubCellIndex = (byte)DefaultSubCell; var defaultSubCellIndex = (byte)DefaultSubCell;
if (defaultSubCellIndex == byte.MaxValue) if (defaultSubCellIndex == byte.MaxValue)
DefaultSubCell = (SubCell)(SubCellOffsets.Length / 2); DefaultSubCell = (SubCell)(SubCellOffsets.Length / 2);
else if (defaultSubCellIndex < (SubCellOffsets.Length > 1 ? 1 : 0) || defaultSubCellIndex >= SubCellOffsets.Length) else
throw new InvalidDataException("Subcell default index must be a valid index into the offset triples and must be greater than 0 for mods with subcells"); {
var minSubCellOffset = SubCellOffsets.Length > 1 ? 1 : 0;
if (defaultSubCellIndex < minSubCellOffset || defaultSubCellIndex >= SubCellOffsets.Length)
throw new InvalidDataException("Subcell default index must be a valid index into the offset triples and must be greater than 0 for mods with subcells");
}
var makeCorners = Type == MapGridType.RectangularIsometric ? var makeCorners = Type == MapGridType.RectangularIsometric ?
(Func<int[], WVec[]>)IsometricCellCorners : RectangularCellCorners; (Func<int[], WVec[]>)IsometricCellCorners : RectangularCellCorners;

2
OpenRA.Game/Server/Connection.cs
View File

@@ -55,7 +55,7 @@ namespace OpenRA.Server
// from `socket.Receive(rx)`. // from `socket.Receive(rx)`.
if (!Socket.Poll(0, SelectMode.SelectRead)) break; if (!Socket.Poll(0, SelectMode.SelectRead)) break;
if (0 < (len = Socket.Receive(rx))) if ((len = Socket.Receive(rx)) > 0)
Data.AddRange(rx.Take(len)); Data.AddRange(rx.Take(len));
else else
{ {

2
OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs
View File

@@ -385,7 +385,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
MulBignumWord(esi, globOne, tmp, 2 * len); MulBignumWord(esi, globOne, tmp, 2 * len);
if ((*edi & 0x8000) == 0) if ((*edi & 0x8000) == 0)
{ {
if (0 != SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len)) if (SubBigNum((uint*)esi, (uint*)esi, g1, 0, (int)len) != 0)
(*edi)--; (*edi)--;
} }
} }

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

@@ -116,8 +116,8 @@ namespace OpenRA.Mods.Common.FileFormats
var flags = (SoundFlags)s.ReadByte(); var flags = (SoundFlags)s.ReadByte();
var samples = outputSize; var samples = outputSize;
if (0 != (flags & SoundFlags.Stereo)) samples /= 2; if ((flags & SoundFlags.Stereo) != 0) samples /= 2;
if (0 != (flags & SoundFlags._16Bit)) samples /= 2; if ((flags & SoundFlags._16Bit) != 0) samples /= 2;
return (float)samples / sampleRate; return (float)samples / sampleRate;
} }