From 548de12e8508b65cbabef20e063711bb02d90319 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 7 Jun 2019 22:01:55 +0100 Subject: [PATCH] Add newlines after closing braces. --- OpenRA.Game/Platform.cs | 3 +++ OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs | 1 + OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs | 11 ++++------- OpenRA.Mods.Common/AudioLoaders/VocLoader.cs | 2 ++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/OpenRA.Game/Platform.cs b/OpenRA.Game/Platform.cs index c8592dae47..6ed0bc2e31 100644 --- a/OpenRA.Game/Platform.cs +++ b/OpenRA.Game/Platform.cs @@ -110,6 +110,7 @@ namespace OpenRA fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "OpenRA"); break; } + case PlatformType.OSX: { preferredSupportDir = fallbackSupportDir = Path.Combine( @@ -117,6 +118,7 @@ namespace OpenRA "Library", "Application Support", "OpenRA"); break; } + case PlatformType.Linux: { fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra"); @@ -129,6 +131,7 @@ namespace OpenRA break; } + default: { preferredSupportDir = fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra"); diff --git a/OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs b/OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs index 1491742277..90ba559b79 100644 --- a/OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs +++ b/OpenRA.Mods.Cnc/FileFormats/BlowfishKeyProvider.cs @@ -302,6 +302,7 @@ namespace OpenRA.Mods.Cnc.FileFormats pn2++; tmp >>= 16; } + *pn1 += (ushort)tmp; } } diff --git a/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs index 9e2b8e8fcb..141582160d 100644 --- a/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs +++ b/OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs @@ -70,6 +70,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands { 0x48, "palet03" }, { 0x49, "palet04" }, + // Bridges { 0x4A, "lobrdg_b" }, // lobrdg01 { 0x4B, "lobrdg_b" }, // lobrdg02 { 0x4C, "lobrdg_b" }, // lobrdg03 @@ -99,11 +100,13 @@ namespace OpenRA.Mods.Cnc.UtilityCommands { 0x64, "lobrdg_b_d" }, // lobrdg27 { 0x65, "lobrdg_a_d" }, // lobrdg28 + // Ramps { 0x7A, "lobrdg_r_se" }, // lobrdg1 { 0x7B, "lobrdg_r_nw" }, // lobrdg2 { 0x7C, "lobrdg_r_ne" }, // lobrdg3 { 0x7D, "lobrdg_r_sw" }, // lobrdg4 + // Other { 0xA7, "veinhole" }, { 0xA8, "srock01" }, { 0xA9, "srock02" }, @@ -162,12 +165,9 @@ namespace OpenRA.Mods.Cnc.UtilityCommands { 0x4B, DamageState.Undamaged }, { 0x4C, DamageState.Undamaged }, { 0x4D, DamageState.Undamaged }, - { 0x4E, DamageState.Heavy }, { 0x4F, DamageState.Heavy }, - { 0x50, DamageState.Heavy }, - { 0x51, DamageState.Critical }, { 0x52, DamageState.Critical }, @@ -176,12 +176,9 @@ namespace OpenRA.Mods.Cnc.UtilityCommands { 0x54, DamageState.Undamaged }, { 0x55, DamageState.Undamaged }, { 0x56, DamageState.Undamaged }, - { 0x57, DamageState.Heavy }, { 0x58, DamageState.Heavy }, - { 0x59, DamageState.Heavy }, - { 0x5A, DamageState.Critical }, { 0x5B, DamageState.Critical }, @@ -201,7 +198,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands { 0x7C, DamageState.Undamaged }, { 0x7D, DamageState.Undamaged }, - // actually dead, placeholders for resurrection + // Actually dead, placeholders for resurrection { 0x64, DamageState.Undamaged }, { 0x65, DamageState.Undamaged }, }; diff --git a/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs b/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs index b683c64c48..39d3238441 100644 --- a/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs +++ b/OpenRA.Mods.Common/AudioLoaders/VocLoader.cs @@ -286,6 +286,7 @@ namespace OpenRA.Mods.Common.AudioLoaders return; } } + currentBlockEnded = true; } @@ -327,6 +328,7 @@ namespace OpenRA.Mods.Common.AudioLoaders samplesLeftInBlock = currentBlock.Current.SampleBlock.Samples; return; } + currentBlockEnded = true; } }