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

Add newlines after closing braces.

Browse Source
This commit is contained in:
Paul Chote
2019-06-07 22:01:55 +01:00
committed by abcdefg30
parent 9f15754926
commit 548de12e85
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Game/Platform.cs
View File

@@ -110,6 +110,7 @@ namespace OpenRA
fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "OpenRA"); fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), "OpenRA");
break; break;
} }
case PlatformType.OSX: case PlatformType.OSX:
{ {
preferredSupportDir = fallbackSupportDir = Path.Combine( preferredSupportDir = fallbackSupportDir = Path.Combine(
@@ -117,6 +118,7 @@ namespace OpenRA
"Library", "Application Support", "OpenRA"); "Library", "Application Support", "OpenRA");
break; break;
} }
case PlatformType.Linux: case PlatformType.Linux:
{ {
fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra"); fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra");
@@ -129,6 +131,7 @@ namespace OpenRA
break; break;
} }
default: default:
{ {
preferredSupportDir = fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra"); preferredSupportDir = fallbackSupportDir = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Personal), ".openra");

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

@@ -302,6 +302,7 @@ namespace OpenRA.Mods.Cnc.FileFormats
pn2++; pn2++;
tmp >>= 16; tmp >>= 16;
} }
*pn1 += (ushort)tmp; *pn1 += (ushort)tmp;
} }
} }

11
OpenRA.Mods.Cnc/UtilityCommands/ImportTSMapCommand.cs
View File

@@ -70,6 +70,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x48, "palet03" }, { 0x48, "palet03" },
{ 0x49, "palet04" }, { 0x49, "palet04" },
// Bridges
{ 0x4A, "lobrdg_b" }, // lobrdg01 { 0x4A, "lobrdg_b" }, // lobrdg01
{ 0x4B, "lobrdg_b" }, // lobrdg02 { 0x4B, "lobrdg_b" }, // lobrdg02
{ 0x4C, "lobrdg_b" }, // lobrdg03 { 0x4C, "lobrdg_b" }, // lobrdg03
@@ -99,11 +100,13 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x64, "lobrdg_b_d" }, // lobrdg27 { 0x64, "lobrdg_b_d" }, // lobrdg27
{ 0x65, "lobrdg_a_d" }, // lobrdg28 { 0x65, "lobrdg_a_d" }, // lobrdg28
// Ramps
{ 0x7A, "lobrdg_r_se" }, // lobrdg1 { 0x7A, "lobrdg_r_se" }, // lobrdg1
{ 0x7B, "lobrdg_r_nw" }, // lobrdg2 { 0x7B, "lobrdg_r_nw" }, // lobrdg2
{ 0x7C, "lobrdg_r_ne" }, // lobrdg3 { 0x7C, "lobrdg_r_ne" }, // lobrdg3
{ 0x7D, "lobrdg_r_sw" }, // lobrdg4 { 0x7D, "lobrdg_r_sw" }, // lobrdg4
// Other
{ 0xA7, "veinhole" }, { 0xA7, "veinhole" },
{ 0xA8, "srock01" }, { 0xA8, "srock01" },
{ 0xA9, "srock02" }, { 0xA9, "srock02" },
@@ -162,12 +165,9 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x4B, DamageState.Undamaged }, { 0x4B, DamageState.Undamaged },
{ 0x4C, DamageState.Undamaged }, { 0x4C, DamageState.Undamaged },
{ 0x4D, DamageState.Undamaged }, { 0x4D, DamageState.Undamaged },
{ 0x4E, DamageState.Heavy }, { 0x4E, DamageState.Heavy },
{ 0x4F, DamageState.Heavy }, { 0x4F, DamageState.Heavy },
{ 0x50, DamageState.Heavy }, { 0x50, DamageState.Heavy },
{ 0x51, DamageState.Critical }, { 0x51, DamageState.Critical },
{ 0x52, DamageState.Critical }, { 0x52, DamageState.Critical },
@@ -176,12 +176,9 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x54, DamageState.Undamaged }, { 0x54, DamageState.Undamaged },
{ 0x55, DamageState.Undamaged }, { 0x55, DamageState.Undamaged },
{ 0x56, DamageState.Undamaged }, { 0x56, DamageState.Undamaged },
{ 0x57, DamageState.Heavy }, { 0x57, DamageState.Heavy },
{ 0x58, DamageState.Heavy }, { 0x58, DamageState.Heavy },
{ 0x59, DamageState.Heavy }, { 0x59, DamageState.Heavy },
{ 0x5A, DamageState.Critical }, { 0x5A, DamageState.Critical },
{ 0x5B, DamageState.Critical }, { 0x5B, DamageState.Critical },
@@ -201,7 +198,7 @@ namespace OpenRA.Mods.Cnc.UtilityCommands
{ 0x7C, DamageState.Undamaged }, { 0x7C, DamageState.Undamaged },
{ 0x7D, DamageState.Undamaged }, { 0x7D, DamageState.Undamaged },
// actually dead, placeholders for resurrection // Actually dead, placeholders for resurrection
{ 0x64, DamageState.Undamaged }, { 0x64, DamageState.Undamaged },
{ 0x65, DamageState.Undamaged }, { 0x65, DamageState.Undamaged },
}; };

2
OpenRA.Mods.Common/AudioLoaders/VocLoader.cs
View File

@@ -286,6 +286,7 @@ namespace OpenRA.Mods.Common.AudioLoaders
return; return;
} }
} }
currentBlockEnded = true; currentBlockEnded = true;
} }
@@ -327,6 +328,7 @@ namespace OpenRA.Mods.Common.AudioLoaders
samplesLeftInBlock = currentBlock.Current.SampleBlock.Samples; samplesLeftInBlock = currentBlock.Current.SampleBlock.Samples;
return; return;
} }
currentBlockEnded = true; currentBlockEnded = true;
} }
} }