RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use new static IsDebug method

This commit is contained in:
Dean Herbert 2017-09-19 13:29:50 +09:00
parent 511874389a
commit 096f53d769
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
osu.Game/OsuGameBase.cs
View File

@ -6,6 +6,7 @@
using System.Reflection;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Development;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.IO.Stores;
@ -59,25 +60,12 @@ public class OsuGameBase : Framework.Game, IOnlineComponent
public bool IsDeployedBuild => AssemblyName.Version.Major > 0;
public bool IsDebug
{
get
{
// ReSharper disable once RedundantAssignment
bool isDebug = false;
// Debug.Assert conditions are only evaluated in debug mode
Debug.Assert(isDebug = true);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
return isDebug;
}
}
public string Version
{
get
{
if (!IsDeployedBuild)
return @"local " + (IsDebug ? @"debug" : @"release");
return @"local " + (DebugUtils.IsDebug ? @"debug" : @"release");
var assembly = AssemblyName;
return $@"{assembly.Version.Major}.{assembly.Version.Minor}.{assembly.Version.Build}";

3
osu.Game/Overlays/Settings/SettingsFooter.cs
View File

@ -3,6 +3,7 @@
using System.Collections.Generic;
using osu.Framework.Allocation;
using osu.Framework.Development;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
@ -64,7 +65,7 @@ private void load(OsuGameBase game, OsuColour colours, RulesetStore rulesets)
Origin = Anchor.TopCentre,
TextSize = 14,
Text = game.Version,
Colour = game.IsDebug ? colours.Red : Color4.White,
Colour = DebugUtils.IsDebug ? colours.Red : Color4.White,
},
};
}

3
osu.Game/Overlays/VersionManager.cs
View File

@ -5,6 +5,7 @@
using System.Diagnostics;
using System.Net.Http;
using osu.Framework.Allocation;
using osu.Framework.Development;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
@ -68,7 +69,7 @@ private void load(NotificationOverlay notification, OsuColour colours, TextureSt
},
new OsuSpriteText
{
Colour = game.IsDebug ? colours.Red : Color4.White,
Colour = DebugUtils.IsDebug ? colours.Red : Color4.White,
Text = game.Version
},
}