h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Merge pull request #3334 from agnimurus/master

Browse Source 
Refactor some variable names for improved code readability
This commit is contained in:
Dean Herbert 2018-09-01 17:38:47 +09:00 committed by GitHub
commit b0f9c0f6f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/OsuGame.cs
View File

@ -75,10 +75,10 @@ namespace osu.Game
{
get
{
Screen s = screenStack;
while (s != null && !(s is Intro))
s = s.ChildScreen;
return s as Intro;
Screen screen = screenStack;
while (screen != null && !(screen is Intro))
screen = screen.ChildScreen;
return screen as Intro;
}
}
@ -126,8 +126,8 @@ namespace osu.Game
/// <param name="toolbar">Whether the toolbar should also be hidden.</param>
public void CloseAllOverlays(bool toolbar = true)
{
foreach (var o in overlays)
o.State = Visibility.Hidden;
foreach (var overlay in overlays)
overlay.State = Visibility.Hidden;
if (toolbar) Toolbar.State = Visibility.Hidden;
}
@ -244,7 +244,7 @@ namespace osu.Game
/// <param name="beatmapId">The beatmap to show.</param>
public void ShowBeatmap(int beatmapId) => beatmapSetOverlay.FetchAndShowBeatmap(beatmapId);
protected void LoadScore(Score s)
protected void LoadScore(Score score)
{
scoreLoad?.Cancel();
@ -252,18 +252,18 @@ namespace osu.Game
if (menu == null)
{
scoreLoad = Schedule(() => LoadScore(s));
scoreLoad = Schedule(() => LoadScore(score));
return;
}
if (!menu.IsCurrentScreen)
{
menu.MakeCurrent();
this.Delay(500).Schedule(() => LoadScore(s), out scoreLoad);
this.Delay(500).Schedule(() => LoadScore(score), out scoreLoad);
return;
}
if (s.Beatmap == null)
if (score.Beatmap == null)
{
notifications.Post(new SimpleNotification
{
@ -273,12 +273,12 @@ namespace osu.Game
return;
}
ruleset.Value = s.Ruleset;
ruleset.Value = score.Ruleset;
Beatmap.Value = BeatmapManager.GetWorkingBeatmap(s.Beatmap);
Beatmap.Value.Mods.Value = s.Mods;
Beatmap.Value = BeatmapManager.GetWorkingBeatmap(score.Beatmap);
Beatmap.Value.Mods.Value = score.Mods;
menu.Push(new PlayerLoader(new ReplayPlayer(s.Replay)));
menu.Push(new PlayerLoader(new ReplayPlayer(score.Replay)));
}
protected override void Dispose(bool isDisposing)