h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 19:32:55 +08:00
Code Issues Releases Wiki Activity

Simplify some default value checks (we are sure the return is an IBindable)

Browse Source
This commit is contained in:
Dean Herbert 2021-01-03 15:47:15 +09:00
parent 1a44338124
commit 23e216fa0b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/Online/API/APIMod.cs
View File

@ -31,7 +31,12 @@ namespace osu.Game.Online.API
Acronym = mod.Acronym; Acronym = mod.Acronym;
foreach (var (_, property) in mod.GetSettingsSourceProperties()) foreach (var (_, property) in mod.GetSettingsSourceProperties())
Settings.Add(property.Name.Underscore(), property.GetValue(mod)); {
var bindable = (IBindable)property.GetValue(mod);
if (!bindable.IsDefault)
Settings.Add(property.Name.Underscore(), property.GetValue(mod));
}
} }
public Mod ToMod(Ruleset ruleset) public Mod ToMod(Ruleset ruleset)

8
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -84,12 +84,10 @@ namespace osu.Game.Rulesets.Mods
foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties()) foreach ((SettingSourceAttribute attr, PropertyInfo property) in this.GetOrderedSettingsSourceProperties())
{ {
object bindableObj = property.GetValue(this); var bindable = (IBindable)property.GetValue(this);
if ((bindableObj as IHasDefaultValue)?.IsDefault == true) if (!bindable.IsDefault)
continue; tooltipTexts.Add($"{attr.Label} {bindable}");
tooltipTexts.Add($"{attr.Label} {bindableObj}");
} }
return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s))); return string.Join(", ", tooltipTexts.Where(s => !string.IsNullOrEmpty(s)));