Skip to content

Commit

Permalink
Fix all editorconfig-checker warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
Belonit committed Sep 14, 2022
1 parent af52a28 commit ffe0c08
Show file tree
Hide file tree
Showing 107 changed files with 292 additions and 292 deletions.
2 changes: 1 addition & 1 deletion ClientCore/CCIniFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ private void ApplyBasedOnIni(string basedOn)
{
if (string.IsNullOrEmpty(basedOn))
return;

string path;
if (basedOn.Contains("$THEME_DIR$"))
path = basedOn.Replace("$THEME_DIR$", ProgramConstants.GetResourcePath().TrimEnd(new char[] { '/', '\\' }));
Expand Down
10 changes: 5 additions & 5 deletions ClientCore/ClientConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public void RefreshSettings()
#region Game options

public string Sides => gameOptions_ini.GetStringValue(GENERAL, nameof(Sides), "GDI,Nod,Allies,Soviet");

public string InternalSideIndices => gameOptions_ini.GetStringValue(GENERAL, nameof(InternalSideIndices), string.Empty);

public string SpectatorInternalSideIndex => gameOptions_ini.GetStringValue(GENERAL, nameof(SpectatorInternalSideIndex), string.Empty);
Expand All @@ -157,7 +157,7 @@ public void RefreshSettings()
public string DiscordAppId => clientDefinitionsIni.GetStringValue(SETTINGS, "DiscordAppId", string.Empty);

public int SendSleep => clientDefinitionsIni.GetIntValue(SETTINGS, "SendSleep", 2500);

public int LoadingScreenCount => clientDefinitionsIni.GetIntValue(SETTINGS, "LoadingScreenCount", 2);

public int ThemeCount => clientDefinitionsIni.GetSectionKeys("Themes").Count;
Expand Down Expand Up @@ -201,12 +201,12 @@ public void RefreshSettings()
public string CreditsURL => clientDefinitionsIni.GetStringValue(SETTINGS, "CreditsURL", "http://www.moddb.com/mods/the-dawn-of-the-tiberium-age/tutorials/credits#Rampastring");

public string ManualDownloadURL => clientDefinitionsIni.GetStringValue(SETTINGS, "ManualDownloadURL", string.Empty);

public string FinalSunIniPath => clientDefinitionsIni.GetStringValue(SETTINGS, "FSIniPath", "FinalSun/FinalSun.ini");

public int MaxNameLength => clientDefinitionsIni.GetIntValue(SETTINGS, "MaxNameLength", 16);

public int MapCellSizeX => clientDefinitionsIni.GetIntValue(SETTINGS, "MapCellSizeX", 48);
public int MapCellSizeX => clientDefinitionsIni.GetIntValue(SETTINGS, "MapCellSizeX", 48);

public int MapCellSizeY => clientDefinitionsIni.GetIntValue(SETTINGS, "MapCellSizeY", 24);

Expand Down Expand Up @@ -277,7 +277,7 @@ public string GetGameExecutableName()
public bool DisplayPlayerCountInTopBar => clientDefinitionsIni.GetBooleanValue(SETTINGS, "DisplayPlayerCountInTopBar", false);

/// <summary>
/// The name of the executable in the main game directory that selects
/// The name of the executable in the main game directory that selects
/// the correct main client executable.
/// For example, DTA.exe in case of DTA.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions ClientCore/ClientCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -316,11 +316,11 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>
2 changes: 1 addition & 1 deletion ClientCore/CnCNet5/NameValidator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static string GetValidOfflineName(string name)

if (validName.Length > ClientConfiguration.Instance.MaxNameLength)
return validName.Substring(0, ClientConfiguration.Instance.MaxNameLength);

return validName;
}
}
Expand Down
2 changes: 1 addition & 1 deletion ClientCore/INIProcessing/IniPreprocessInfoStore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void Load()
}

/// <summary>
/// Checks if a (potentially processed) INI file is up-to-date
/// Checks if a (potentially processed) INI file is up-to-date
/// or whether it needs to be (re)processed.
/// </summary>
/// <param name="fileName">The name of the INI file in its directory.
Expand Down
2 changes: 1 addition & 1 deletion ClientCore/OSVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
WIN7,
WIN810,
UNIX
}
}
2 changes: 1 addition & 1 deletion ClientCore/ProfanityFilter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public string CensorText(string text)
{
string regularExpression = ToRegexPattern(censoredWord);
censoredText = Regex.Replace(censoredText, regularExpression, StarCensoredMatch,
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
}
return censoredText;
}
Expand Down
12 changes: 6 additions & 6 deletions ClientCore/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("DTA CnCNet Client")]
Expand All @@ -13,8 +13,8 @@
[assembly: AssemblyTrademark("Dawn of the Tiberium Age")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

Expand All @@ -24,12 +24,12 @@
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.3")]
[assembly: AssemblyFileVersion("2.0.0.3")]
[assembly: AssemblyFileVersion("2.0.0.3")]
38 changes: 19 additions & 19 deletions ClientCore/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ClientCore/SavedGameManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ public static bool EraseSavedGames()
{
for (int i = 0; i < 1000; i++)
{
File.Delete(GetSaveGameDirectoryPath() +
File.Delete(GetSaveGameDirectoryPath() +
"/" + string.Format("SVGM_{0}.NET", i.ToString("D3")));
}
}
Expand Down
32 changes: 16 additions & 16 deletions ClientCore/Settings/UserINISettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -192,29 +192,29 @@ protected UserINISettings(IniFile iniFile)
public BoolSetting NotifyOnUserListChange { get; private set; }

public BoolSetting DisablePrivateMessagePopups { get; private set; }

public IntSetting AllowPrivateMessagesFromState { get; private set; }

public BoolSetting EnableMapSharing { get; private set; }

public BoolSetting AlwaysDisplayTunnelList { get; private set; }

public IntSetting MapSortState { get; private set; }

/*********************/
/* GAME LIST FILTERS */
/*********************/

public IntSetting SortState { get; private set; }

public BoolSetting ShowFriendGamesOnly { get; private set; }

public BoolSetting HideLockedGames { get; private set; }

public BoolSetting HidePasswordedGames { get; private set; }

public BoolSetting HideIncompatibleGames { get; private set; }

public IntRangeSetting MaxPlayerCount { get; private set; }

/********/
Expand All @@ -240,11 +240,11 @@ protected UserINISettings(IniFile iniFile)
public BoolSetting MinimizeWindowsOnGameStart { get; private set; }

public BoolSetting AutoRemoveUnderscoresFromName { get; private set; }

public StringListSetting FavoriteMaps { get; private set; }

public void SetValue(string section, string key, string value)
=> SettingsIni.SetStringValue(section, key, value);
=> SettingsIni.SetStringValue(section, key, value);

public void SetValue(string section, string key, bool value)
=> SettingsIni.SetBooleanValue(section, key, value);
Expand Down Expand Up @@ -277,7 +277,7 @@ public bool ToggleFavoriteMap(string mapName, string gameModeName, bool isFavori
FavoriteMaps.Remove(favoriteMapKey);
else
FavoriteMaps.Add(favoriteMapKey);

Instance.SaveSettings();

return !isFavorite;
Expand All @@ -291,7 +291,7 @@ public bool ToggleFavoriteMap(string mapName, string gameModeName, bool isFavori
public bool IsFavoriteMap(string nameName, string gameModeName) => FavoriteMaps.Value.Contains(FavoriteMapKey(nameName, gameModeName));

private string FavoriteMapKey(string nameName, string gameModeName) => $"{nameName}:{gameModeName}";

public void ReloadSettings()
{
SettingsIni.Reload();
Expand Down Expand Up @@ -319,10 +319,10 @@ public void SaveSettings()
public bool IsGameFiltersApplied()
{
return ShowFriendGamesOnly.Value != DEFAULT_SHOW_FRIENDS_ONLY_GAMES ||
HideLockedGames.Value != DEFAULT_HIDE_LOCKED_GAMES ||
HidePasswordedGames.Value != DEFAULT_HIDE_PASSWORDED_GAMES ||
HideIncompatibleGames.Value != DEFAULT_HIDE_INCOMPATIBLE_GAMES ||
MaxPlayerCount.Value != DEFAULT_MAX_PLAYER_COUNT;
HideLockedGames.Value != DEFAULT_HIDE_LOCKED_GAMES ||
HidePasswordedGames.Value != DEFAULT_HIDE_PASSWORDED_GAMES ||
HideIncompatibleGames.Value != DEFAULT_HIDE_INCOMPATIBLE_GAMES ||
MaxPlayerCount.Value != DEFAULT_MAX_PLAYER_COUNT;
}

public void ResetGameFilters()
Expand Down
2 changes: 1 addition & 1 deletion ClientCore/Statistics/MatchStatistics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public MatchStatistics(string gameVersion, int gameId, string mapName, string ga
public void AddPlayer(string name, bool isLocal, bool isAI, bool isSpectator,
int side, int team, int color, int aiLevel)
{
PlayerStatistics ps = new PlayerStatistics(name, isLocal, isAI, isSpectator,
PlayerStatistics ps = new PlayerStatistics(name, isLocal, isAI, isSpectator,
side, team, color, aiLevel);
Players.Add(ps);
}
Expand Down
2 changes: 1 addition & 1 deletion ClientCore/Statistics/PlayerStatistics.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public class PlayerStatistics
{
public PlayerStatistics() { }

public PlayerStatistics(string name, bool isLocal, bool isAi, bool isSpectator,
public PlayerStatistics(string name, bool isLocal, bool isAi, bool isSpectator,
int side, int team, int color, int aiLevel)
{
Name = name;
Expand Down
Loading

0 comments on commit ffe0c08

Please sign in to comment.