sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into replay

Browse Source 
# Conflicts:
#	osu.Game/Modes/Mod.cs
This commit is contained in:
Dean Herbert
2017-03-07 14:32:14 +09:00
parent 5cbcf7a20a 95fb34ccfb
commit bff1179624
8 changed files with 77 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ using OpenTK.Input;
using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
@ -111,14 +110,7 @@ namespace osu.Game.Overlays.Mods
if (mod == value) return;
mod = value;
if (mod is MultiMod)
{
Mods = ((MultiMod)mod).Mods;
}
else
{
Mods = new[] { mod };
}
Mods = (mod as MultiMod)?.Mods ?? new[] { mod };
createIcons();
if (Mods.Length > 0)
@ -185,7 +177,7 @@ namespace osu.Game.Overlays.Mods
private void displayMod(Mod mod)
{
displayIcon.Icon = mod.Icon;
text.Text = mod.Name.GetDescription();
text.Text = mod.Name;
}
private void displaySelectedMod()

10
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -124,7 +124,7 @@ namespace osu.Game.Overlays.Mods
}
}
public void DeselectMod(Modes.Mods modName)
public void DeselectType(Type modType)
{
foreach (ModSection section in modSectionsContainer.Children)
{
@ -132,7 +132,7 @@ namespace osu.Game.Overlays.Mods
{
foreach (Mod mod in button.Mods)
{
if (mod.Name == modName)
if (modType.IsInstanceOfType(mod))
{
button.Deselect();
return;
@ -146,10 +146,8 @@ namespace osu.Game.Overlays.Mods
{
if (selectedMod != null)
{
foreach (Modes.Mods disableMod in selectedMod.DisablesMods)
{
DeselectMod(disableMod);
}
foreach (Type t in selectedMod.IncompatibleMods)
DeselectType(t);
}
refreshSelectedMods();