h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-18 02:47:19 +08:00
Code Issues Releases Wiki Activity

revert accidentally renamed variables

Browse Source
This commit is contained in:
Unknown 2019-01-25 11:22:05 +01:00
parent 4a916b2dee
commit 77763fde8b
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
View File

@ -93,10 +93,10 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
}
[BackgroundDependencyLoader]
private void load(OsuRulesetConfigManager rulesetConfig)
private void load(OsuRulesetConfigManager config)
{
rulesetConfig.BindWith(OsuRulesetSetting.SnakingInSliders, Body.SnakingIn);
rulesetConfig.BindWith(OsuRulesetSetting.SnakingOutSliders, Body.SnakingOut);
config.BindWith(OsuRulesetSetting.SnakingInSliders, Body.SnakingIn);
config.BindWith(OsuRulesetSetting.SnakingOutSliders, Body.SnakingOut);
positionBindable.BindValueChanged(_ => Position = HitObject.StackedPosition);
scaleBindable.BindValueChanged(v =>

4
osu.Game/Graphics/Containers/ScalingContainer.cs
View File

@ -65,11 +65,11 @@ namespace osu.Game.Graphics.Containers
}
[BackgroundDependencyLoader]
private void load(OsuConfigManager gameConfig)
private void load(OsuConfigManager osuConfig)
{
if (applyUIScale)
{
uiScale = gameConfig.GetBindable<float>(OsuSetting.UIScale);
uiScale = osuConfig.GetBindable<float>(OsuSetting.UIScale);
uiScale.BindValueChanged(scaleChanged, true);
}
}

4
osu.Game/Overlays/OnScreenDisplay.cs
View File

@ -117,10 +117,10 @@ namespace osu.Game.Overlays
}
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager gameConfig)
private void load(FrameworkConfigManager frameworkConfig, OsuConfigManager osuConfig)
{
BeginTracking(this, frameworkConfig);
BeginTracking(this, gameConfig);
BeginTracking(this, osuConfig);
}
private readonly Dictionary<(object, IConfigManager), TrackedSettings> trackedConfigManagers = new Dictionary<(object, IConfigManager), TrackedSettings>();

16
osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
View File

@ -38,16 +38,16 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
private const int transition_duration = 400;
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager config, OsuConfigManager gameConfig, OsuGameBase game)
private void load(FrameworkConfigManager config, OsuConfigManager osuConfig, OsuGameBase game)
{
this.game = game;
scalingMode = gameConfig.GetBindable<ScalingMode>(OsuSetting.Scaling);
scalingMode = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling);
sizeFullscreen = config.GetBindable<Size>(FrameworkSetting.SizeFullscreen);
scalingSizeX = gameConfig.GetBindable<float>(OsuSetting.ScalingSizeX);
scalingSizeY = gameConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
scalingPositionX = gameConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
scalingPositionY = gameConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
scalingSizeX = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeX);
scalingSizeY = osuConfig.GetBindable<float>(OsuSetting.ScalingSizeY);
scalingPositionX = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionX);
scalingPositionY = osuConfig.GetBindable<float>(OsuSetting.ScalingPositionY);
Container resolutionSettingsContainer;
@ -67,13 +67,13 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
{
LabelText = "UI Scaling",
TransferValueOnCommit = true,
Bindable = gameConfig.GetBindable<float>(OsuSetting.UIScale),
Bindable = osuConfig.GetBindable<float>(OsuSetting.UIScale),
KeyboardStep = 0.01f
},
new SettingsEnumDropdown<ScalingMode>
{
LabelText = "Screen Scaling",
Bindable = gameConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
Bindable = osuConfig.GetBindable<ScalingMode>(OsuSetting.Scaling),
},
scalingSettings = new FillFlowContainer<SettingsSlider<float>>
{

4
osu.Game/Overlays/Settings/Sections/Graphics/RendererSettings.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
protected override string Header => "Renderer";
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager config, OsuConfigManager gameConfig)
private void load(FrameworkConfigManager config, OsuConfigManager osuConfig)
{
// NOTE: Compatability mode omitted
Children = new Drawable[]
@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings.Sections.Graphics
new SettingsCheckbox
{
LabelText = "Show FPS",
Bindable = gameConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
Bindable = osuConfig.GetBindable<bool>(OsuSetting.ShowFpsDisplay)
},
};
}

6
osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
private SensitivitySetting sensitivity;
[BackgroundDependencyLoader]
private void load(OsuConfigManager gameConfig, FrameworkConfigManager config)
private void load(OsuConfigManager osuConfig, FrameworkConfigManager config)
{
Children = new Drawable[]
{
@ -46,12 +46,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
new SettingsCheckbox
{
LabelText = "Disable mouse wheel during gameplay",
Bindable = gameConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableWheel)
},
new SettingsCheckbox
{
LabelText = "Disable mouse buttons during gameplay",
Bindable = gameConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
Bindable = osuConfig.GetBindable<bool>(OsuSetting.MouseDisableButtons)
},
};