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

Merge remote-tracking branch 'peppy/less-mods-enum' into modselect

Browse Source
This commit is contained in:
Huo Yaoyuan
2017-03-06 17:35:15 +08:00
parent ad75ead665 12a3b1414f
commit f6f20cafd3
8 changed files with 79 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,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

@ -123,7 +123,7 @@ namespace osu.Game.Overlays.Mods
}
}
public void DeselectMod(Modes.Mods modName)
public void DeselectType(Type modType)
{
foreach (ModSection section in modSectionsContainer.Children)
{
@ -131,7 +131,7 @@ namespace osu.Game.Overlays.Mods
{
foreach (Mod mod in button.Mods)
{
if (mod.Name == modName)
if (modType.IsInstanceOfType(mod))
{
button.Deselect();
return;
@ -145,10 +145,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();