Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hide options with failing showcondition

Browse Source
This commit is contained in:
yugecin 2016-12-04 13:49:35 +01:00
parent e2453db9d5
commit 27be84e99a
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/itdelatrisu/opsu/states/OptionsMenu.java
View File

@ -113,6 +113,7 @@ public class OptionsMenu extends BasicGameState {
}), }),
DANCE ("Dance", new GameOption[] { DANCE ("Dance", new GameOption[] {
GameOption.DANCE_MOVER, GameOption.DANCE_MOVER,
GameOption.DANCE_QUAD_BEZ_AGRESSIVE,
GameOption.DANCE_MOVER_DIRECTION, GameOption.DANCE_MOVER_DIRECTION,
GameOption.DANCE_SLIDER_MOVER_TYPE, GameOption.DANCE_SLIDER_MOVER_TYPE,
GameOption.DANCE_SPINNER, GameOption.DANCE_SPINNER,
@ -277,9 +278,12 @@ public class OptionsMenu extends BasicGameState {
if (selectedOption != null) { if (selectedOption != null) {
hoverOption = selectedOption; hoverOption = selectedOption;
} }
for (int i = 0; i < currentTab.options.length; i++) { for (int i = 0, j = 0; i < currentTab.options.length; i++) {
GameOption option = currentTab.options[i]; GameOption option = currentTab.options[i];
drawOption(option, i, hoverOption == option); if (!option.showCondition()) {
continue;
}
drawOption(option, j++, hoverOption == option);
} }
// option tabs // option tabs
@ -602,6 +606,14 @@ public class OptionsMenu extends BasicGameState {
if (index >= currentTab.options.length) if (index >= currentTab.options.length)
return null; return null;
int i = index;
while (i >= 0) {
if (!currentTab.options[i--].showCondition()) {
if (++index >= currentTab.options.length) {
return null;
}
}
}
return currentTab.options[index]; return currentTab.options[index];
} }
} }