h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 00:47:24 +08:00
Code Issues Releases Wiki Activity

Fix formatting regressions

Browse Source
This commit is contained in:
Dean Herbert 2017-10-16 13:11:35 +09:00
parent 0a6dcdd405
commit 4981630131
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Database/DatabaseBackedStore.cs
View File

@ -36,7 +36,6 @@ namespace osu.Game.Database
/// </summary>
protected virtual void StartupTasks()
{
}
/// <summary>

2
osu.Game/Input/KeyBindingStore.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Input
public void Update(KeyBinding keyBinding)
{
var dbKeyBinding = Connection.DatabasedKeyBinding.FirstOrDefault(kb => kb.ToString() == keyBinding.ToString());
if (dbKeyBinding!=null)
if (dbKeyBinding != null)
{
dbKeyBinding.KeyCombination = keyBinding.KeyCombination;
dbKeyBinding.Action = keyBinding.Action;

11
osu.Game/Rulesets/RulesetStore.cs
View File

@ -20,7 +20,8 @@ namespace osu.Game.Rulesets
public IEnumerable<RulesetInfo> AllRulesets => Connection.RulesetInfo.Where(r => r.Available);
public RulesetStore(OsuDbContext connection) : base(connection)
public RulesetStore(OsuDbContext connection)
: base(connection)
{
}
@ -42,14 +43,14 @@ namespace osu.Game.Rulesets
{
Connection.Database.ExecuteSqlCommand("DELETE FROM RulesetInfo");
}
var instances = loaded_assemblies.Values.Select(r => (Ruleset)Activator.CreateInstance(r, new RulesetInfo()));
//add all legacy modes in correct order
foreach (var r in instances.Where(r => r.LegacyID >= 0).OrderBy(r => r.LegacyID))
{
var rulesetInfo = createRulesetInfo(r);
if (Connection.RulesetInfo.SingleOrDefault(rsi=>rsi.ID==rulesetInfo.ID)==null)
if (Connection.RulesetInfo.SingleOrDefault(rsi => rsi.ID == rulesetInfo.ID) == null)
{
Connection.RulesetInfo.Add(rulesetInfo);
}
@ -96,7 +97,9 @@ namespace osu.Game.Rulesets
var assembly = Assembly.LoadFrom(file);
loaded_assemblies[assembly] = assembly.GetTypes().First(t => t.IsSubclassOf(typeof(Ruleset)));
}
catch (Exception) { }
catch (Exception)
{
}
}
private RulesetInfo createRulesetInfo(Ruleset ruleset) => new RulesetInfo