RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-09 23:59:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix code style issues & compilation failures

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-10-19 20:22:48 +02:00
parent 22bde43106
commit 053c7a69a6
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/UI/OsuPlayfield.cs
View File

@ -20,6 +20,7 @@ using osu.Game.Skinning;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Screens;
using osuTK; using osuTK;
namespace osu.Game.Rulesets.Osu.UI namespace osu.Game.Rulesets.Osu.UI
@ -36,12 +37,10 @@ namespace osu.Game.Rulesets.Osu.UI
protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer(); protected override GameplayCursorContainer CreateCursor() => new OsuCursorContainer();
private Bindable<bool> showPlayfieldBorder; private Bindable<bool> showPlayfieldBorder;
private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>(); private readonly IDictionary<HitResult, DrawablePool<DrawableOsuJudgement>> poolDictionary = new Dictionary<HitResult, DrawablePool<DrawableOsuJudgement>>();
public OsuPlayfield() public OsuPlayfield()
{ {
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
@ -87,6 +86,7 @@ namespace osu.Game.Rulesets.Osu.UI
private void load(OsuConfigManager config) private void load(OsuConfigManager config)
{ {
showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder); showPlayfieldBorder = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder);
if (showPlayfieldBorder.Value) if (showPlayfieldBorder.Value)
{ {
AddInternal(new PlayfieldBorder AddInternal(new PlayfieldBorder

5
osu.Game/Overlays/Settings/Sections/Gameplay/GeneralSettings.cs
View File

@ -76,14 +76,13 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
new SettingsEnumDropdown<ScoringMode> new SettingsEnumDropdown<ScoringMode>
{ {
LabelText = "Score display mode", LabelText = "Score display mode",
Bindable = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode), Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
Keywords = new[] { "scoring" } Keywords = new[] { "scoring" }
}, },
new SettingsCheckbox new SettingsCheckbox
{ {
LabelText = "Show playfield border", LabelText = "Show playfield border",
Bindable = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder) Current = config.GetBindable<bool>(OsuSetting.ShowPlayfieldBorder),
Current = config.GetBindable<ScoringMode>(OsuSetting.ScoreDisplayMode),
}, },
}; };

2
osu.Game/Rulesets/Edit/HitObjectComposer.cs
View File

@ -104,7 +104,7 @@ namespace osu.Game.Rulesets.Edit
drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[] drawableRulesetWrapper.CreatePlayfieldAdjustmentContainer().WithChildren(new Drawable[]
{ {
LayerBelowRuleset, LayerBelowRuleset,
new EditorPlayfieldBorder { RelativeSizeAxes = Axes.Both } new PlayfieldBorder { RelativeSizeAxes = Axes.Both }
}), }),
drawableRulesetWrapper, drawableRulesetWrapper,
// layers above playfield // layers above playfield