sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 06:36:31 +09:00
Code Issues Packages Projects Releases Wiki Activity

Let's not rename columns yet

Browse Source
This commit is contained in:
smoogipoo
2017-10-14 14:28:25 +09:00
parent 674ad4a30c
commit b178be21d1
51 changed files with 351 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Input/Bindings/DatabasedKeyBinding.cs
View File

@ -10,9 +10,9 @@ namespace osu.Game.Input.Bindings
public class DatabasedKeyBinding : KeyBinding
{
[DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int Id { get; set; }
public int ID { get; set; }
public int? RulesetInfoId { get; set; }
public int? RulesetID { get; set; }
public int? Variant { get; set; }

2
osu.Game/Input/Bindings/DatabasedKeyBindingInputManager.cs
View File

@ -48,7 +48,7 @@ namespace osu.Game.Input.Bindings
protected override void ReloadMappings()
{
KeyBindings = store.Query(ruleset?.Id, variant);
KeyBindings = store.Query(ruleset?.ID, variant);
}
}
}

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

@ -22,7 +22,7 @@ namespace osu.Game.Input
{
var ruleset = info.CreateInstance();
foreach (var variant in ruleset.AvailableVariants)
insertDefaults(ruleset.GetDefaultKeyBindings(variant), info.Id, variant);
insertDefaults(ruleset.GetDefaultKeyBindings(variant), info.ID, variant);
}
}
@ -48,7 +48,7 @@ namespace osu.Game.Input
{
KeyCombination = insertable.KeyCombination,
Action = insertable.Action,
RulesetInfoId = rulesetId,
RulesetID = rulesetId,
Variant = variant
});
Connection.SaveChanges();
@ -62,7 +62,7 @@ namespace osu.Game.Input
};
public List<KeyBinding> Query(int? rulesetId = null, int? variant = null) =>
new List<KeyBinding>(Connection.DatabasedKeyBinding.Where(b => b.RulesetInfoId == rulesetId && b.Variant == variant));
new List<KeyBinding>(Connection.DatabasedKeyBinding.Where(b => b.RulesetID == rulesetId && b.Variant == variant));
public void Update(KeyBinding keyBinding)
{