Fix newlines in C# files.
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
*/
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Drawing;
|
||||
using System.IO;
|
||||
|
||||
@@ -77,9 +77,9 @@ namespace OpenRA.Graphics
|
||||
for (; secondarySheetIndex < ns; secondarySheetIndex++)
|
||||
if (sheets[secondarySheetIndex] == secondarySheet)
|
||||
break;
|
||||
}
|
||||
|
||||
// Make sure that we have enough free samplers to map both if needed, otherwise flush
|
||||
}
|
||||
|
||||
// Make sure that we have enough free samplers to map both if needed, otherwise flush
|
||||
var needSamplers = (sheetIndex == ns ? 1 : 0) + (secondarySheetIndex == ns ? 1 : 0);
|
||||
if (ns + needSamplers >= sheets.Length)
|
||||
{
|
||||
|
||||
@@ -44,8 +44,8 @@ namespace OpenRA.Graphics
|
||||
sl = ss.SecondaryLeft;
|
||||
st = ss.SecondaryTop;
|
||||
sr = ss.SecondaryRight;
|
||||
sb = ss.SecondaryBottom;
|
||||
|
||||
sb = ss.SecondaryBottom;
|
||||
|
||||
attribC |= ((byte)ss.SecondaryChannel) << 4 | 0x08;
|
||||
attribC |= samplers.Y << 9;
|
||||
}
|
||||
|
||||
@@ -174,26 +174,26 @@ namespace OpenRA.Network
|
||||
if (string.IsNullOrEmpty(ModTitle))
|
||||
{
|
||||
Manifest mod;
|
||||
|
||||
|
||||
if (external != null && external.Version == Version)
|
||||
{
|
||||
// Use external mod registration to populate the section header
|
||||
ModTitle = external.Title;
|
||||
}
|
||||
else if (Game.Mods.TryGetValue(Mod, out mod))
|
||||
{
|
||||
// Use internal mod data to populate the section header, but
|
||||
// on-connect switching must use the external mod plumbing.
|
||||
ModTitle = mod.Metadata.Title;
|
||||
{
|
||||
// Use internal mod data to populate the section header, but
|
||||
// on-connect switching must use the external mod plumbing.
|
||||
ModTitle = mod.Metadata.Title;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Some platforms (e.g. macOS) package each mod separately, so the Mods check above won't work.
|
||||
// Guess based on the most recent ExternalMod instead.
|
||||
{
|
||||
// Some platforms (e.g. macOS) package each mod separately, so the Mods check above won't work.
|
||||
// Guess based on the most recent ExternalMod instead.
|
||||
var guessMod = Game.ExternalMods.Values
|
||||
.OrderByDescending(m => m.Version)
|
||||
.FirstOrDefault(m => m.Id == Mod);
|
||||
|
||||
.FirstOrDefault(m => m.Id == Mod);
|
||||
|
||||
if (guessMod != null)
|
||||
ModTitle = "{0}".F(guessMod.Title);
|
||||
else
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace OpenRA.Server
|
||||
byte b;
|
||||
switch (b = r.ReadByte())
|
||||
{
|
||||
case 0xbf:
|
||||
case 0xbf:
|
||||
// Silently ignore disconnect notifications
|
||||
return null;
|
||||
case 0xff:
|
||||
|
||||
@@ -420,9 +420,9 @@ namespace OpenRA
|
||||
ret += n++ * Sync.Hash(sync);
|
||||
|
||||
// Hash the shared random number generator.
|
||||
ret += SharedRandom.Last;
|
||||
|
||||
// Hash player RenderPlayer status
|
||||
ret += SharedRandom.Last;
|
||||
|
||||
// Hash player RenderPlayer status
|
||||
foreach (var p in Players)
|
||||
if (p.UnlockedRenderPlayer)
|
||||
ret += Sync.HashPlayer(p);
|
||||
|
||||
Reference in New Issue
Block a user