RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-01 20:02:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move seasonalBackgroundMode check up and early return if available

Browse Source
This commit is contained in:
Max Hübner 2020-10-30 17:16:51 +01:00
parent f6eb5680ec
commit 0b46c19b23
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
View File

@ -79,6 +79,18 @@ namespace osu.Game.Screens.Backgrounds
Background newBackground;
string backgroundName;
if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
|| seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
{
var seasonalBackground = seasonalBackgroundLoader.LoadBackground();
if (seasonalBackground != null)
{
seasonalBackground.Depth = currentDisplay;
return seasonalBackground;
}
}
switch (introSequence.Value)
{
case IntroSequence.Welcome:
@ -106,12 +118,6 @@ namespace osu.Game.Screens.Backgrounds
else
newBackground = new Background(backgroundName);
if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
|| seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
{
newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
}
newBackground.Depth = currentDisplay;
return newBackground;