sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into less-mods-enum

Browse Source 
# Conflicts:
#	osu.Game.Modes.Mania/ManiaMod.cs
#	osu.Game.Modes.Osu/OsuMod.cs
#	osu.Game/Modes/Mod.cs
This commit is contained in:
Dean Herbert
2017-03-07 13:42:50 +09:00
parent 39ff68a812 688388333b
commit 3e4cd0dc7c
177 changed files with 666 additions and 526 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -113,23 +113,24 @@ namespace osu.Game.Overlays.Mods
if (mod is MultiMod)
{
mods = ((MultiMod)mod).Mods;
Mods = ((MultiMod)mod).Mods;
}
else
{
mods = new Mod[] { mod };
Mods = new[] { mod };
}
createIcons();
if (mods.Length > 0)
if (Mods.Length > 0)
{
displayMod(mods[0]);
displayMod(Mods[0]);
}
}
}
private Mod[] mods;
public Mod[] Mods => mods; // the mods from Mod, only multiple if Mod is a MultiMod
public Mod[] Mods { get; private set; }
// the mods from Mod, only multiple if Mod is a MultiMod
public Mod SelectedMod => Mods.ElementAtOrDefault(selectedMod);
@ -202,7 +203,7 @@ namespace osu.Game.Overlays.Mods
{
if (Mods.Length > 1)
{
iconsContainer.Add(icons = new ModIcon[]
iconsContainer.Add(icons = new[]
{
new ModIcon
{
@ -222,7 +223,7 @@ namespace osu.Game.Overlays.Mods
}
else
{
iconsContainer.Add(icons = new ModIcon[]
iconsContainer.Add(icons = new[]
{
new ModIcon
{